Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 17:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made the loading of resource strings more unicode compatibly.

Browse source 
svn path=/trunk/; revision=14908
This commit is contained in:
Hartmut Birr 2005-05-01 10:28:58 +00:00
parent 7ce3991a5c
commit ea130b3ba2
47 changed files with 552 additions and 547 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -237,7 +237,7 @@ VOID DestroyAlias (VOID)
/* specified routines */ /* specified routines */
VOID ExpandAlias (LPTSTR cmd, INT maxlen) VOID ExpandAlias (LPTSTR cmd, INT maxlen)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
unsigned n = 0, unsigned n = 0,
m, m,
i, i,
@ -281,8 +281,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); 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,12 +306,12 @@ VOID ExpandAlias (LPTSTR cmd, INT maxlen)
INT CommandAlias (LPTSTR cmd, LPTSTR param) INT CommandAlias (LPTSTR cmd, LPTSTR param)
{ {
LPTSTR ptr; LPTSTR ptr;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -197,7 +197,7 @@ INT CommandAttrib (LPTSTR cmd, LPTSTR param)
BOOL bDirectories = FALSE; BOOL bDirectories = FALSE;
DWORD dwAttrib = 0; DWORD dwAttrib = 0;
DWORD dwMask = 0; DWORD dwMask = 0;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* initialize strings */ /* initialize strings */
szPath[0] = _T('\0'); szPath[0] = _T('\0');
@ -206,8 +206,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -219,7 +219,7 @@ VOID ExitBatch (LPTSTR msg)
BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param) BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
{ {
HANDLE hFile; HANDLE hFile;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL, hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL |
@ -232,8 +232,8 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
return FALSE; return FALSE;
} }

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

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

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

@ -45,15 +45,15 @@
INT cmd_call (LPTSTR cmd, LPTSTR param) INT cmd_call (LPTSTR cmd, LPTSTR param)
{ {
LPBATCH_CONTEXT n = NULL; LPBATCH_CONTEXT n = NULL;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param); DebugPrintf (_T("cmd_call: (\'%s\',\'%s\')\n"), cmd, param);
#endif #endif
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

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

@ -22,13 +22,13 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
INT args; INT args;
UINT uOldCodePage; UINT uOldCodePage;
UINT uNewCodePage; UINT uNewCodePage;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* print help */ /* print help */
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -38,8 +38,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, GetConsoleCP ()); ConErrPrintf (szMsg, GetConsoleCP ());
return 0; return 0;
} }
@ -47,8 +47,8 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (args >= 2) if (args >= 2)
{ {
/* too many parameters */ /* too many parameters */
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, param); ConErrPrintf (szMsg, param);
return 1; return 1;
} }
@ -61,16 +61,16 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (uNewCodePage == 0) if (uNewCodePage == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, arg[0]); ConErrPrintf (szMsg, arg[0]);
freep (arg); freep (arg);
return 1; return 1;
} }
if (!SetConsoleCP (uNewCodePage)) if (!SetConsoleCP (uNewCodePage))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
else else
{ {

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

@ -121,17 +121,16 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
INT GCret; INT GCret;
TCHAR Ch; TCHAR Ch;
DWORD amount,clk; DWORD amount,clk;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, (LPTSTR) Options,sizeof(lpOptions)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, Options,sizeof(lpOptions)/sizeof(TCHAR));
lpOptions = _T(Options); lpOptions = Options;
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0;
return 0;
} }
/* retrieve text */ /* retrieve text */
@ -171,8 +170,8 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
if (_tcslen (lpOptions) == 0) if (_tcslen (lpOptions) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -202,8 +201,8 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
if (*s != _T(',')) if (*s != _T(','))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -214,8 +213,8 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
} }
else if (arg[i][0] == _T('/')) else if (arg[i][0] == _T('/'))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, arg[i]); ConErrPrintf (szMsg, arg[i]);
freep (arg); freep (arg);
return 1; return 1;
} }

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

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

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

@ -552,7 +552,7 @@ VOID ParseCommandLine (LPTSTR cmd)
{ {
TCHAR cmdline[CMDLINE_LENGTH]; TCHAR cmdline[CMDLINE_LENGTH];
LPTSTR s; LPTSTR s;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef FEATURE_REDIRECTION #ifdef FEATURE_REDIRECTION
TCHAR in[CMDLINE_LENGTH] = _T(""); TCHAR in[CMDLINE_LENGTH] = _T("");
TCHAR out[CMDLINE_LENGTH] = _T(""); TCHAR out[CMDLINE_LENGTH] = _T("");
@ -634,15 +634,15 @@ VOID ParseCommandLine (LPTSTR cmd)
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, in); ConErrPrintf (szMsg, in);
return; return;
} }
if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) if (!SetStdHandle (STD_INPUT_HANDLE, hFile))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, in); ConErrPrintf (szMsg, in);
return; return;
} }
#ifdef _DEBUG #ifdef _DEBUG
@ -667,8 +667,8 @@ VOID ParseCommandLine (LPTSTR cmd)
if (hFile[1] == INVALID_HANDLE_VALUE){ if (hFile[1] == INVALID_HANDLE_VALUE){
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
return; return;
} }
@ -720,16 +720,16 @@ VOID ParseCommandLine (LPTSTR cmd)
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, out); ConErrPrintf (szMsg, out);
return; return;
} }
if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, out); ConErrPrintf (szMsg, out);
return; return;
} }
@ -782,16 +782,16 @@ VOID ParseCommandLine (LPTSTR cmd)
NULL); NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, err); ConErrPrintf (szMsg, err);
return; return;
} }
} }
if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) if (!SetStdHandle (STD_ERROR_HANDLE, hFile))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, err); ConErrPrintf (szMsg, err);
return; return;
} }
@ -1076,36 +1076,36 @@ VOID RemoveBreakHandler (VOID)
static VOID static VOID
ShowCommands (VOID) ShowCommands (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* print command list */ /* print command list */
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf (szMsg);
PrintCommandList (); PrintCommandList ();
/* print feature list */ /* print feature list */
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#ifdef FEATURE_ALIASES #ifdef FEATURE_ALIASES
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#endif #endif
#ifdef FEATURE_HISTORY #ifdef FEATURE_HISTORY
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#endif #endif
#ifdef FEATURE_UNIX_FILENAME_COMPLETION #ifdef FEATURE_UNIX_FILENAME_COMPLETION
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#endif #endif
#ifdef FEATURE_DIRECTORY_STACK #ifdef FEATURE_DIRECTORY_STACK
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#endif #endif
#ifdef FEATURE_REDIRECTION #ifdef FEATURE_REDIRECTION
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#endif #endif
ConOutChar (_T('\n')); ConOutChar (_T('\n'));
} }
@ -1124,7 +1124,7 @@ Initialize (int argc, TCHAR* argv[])
TCHAR commandline[CMDLINE_LENGTH]; TCHAR commandline[CMDLINE_LENGTH];
TCHAR ModuleName[_MAX_PATH + 1]; TCHAR ModuleName[_MAX_PATH + 1];
INT i; INT i;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
//INT len; //INT len;
//TCHAR *ptr, *cmdLine; //TCHAR *ptr, *cmdLine;
@ -1154,8 +1154,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
ExitProcess (0); ExitProcess (0);
} }
SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT);
@ -1259,8 +1259,8 @@ Initialize (int argc, TCHAR* argv[])
if (IsExistingFile (_T("commandline"))) if (IsExistingFile (_T("commandline")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, commandline); ConErrPrintf (szMsg, commandline);
ParseCommandLine (commandline); ParseCommandLine (commandline);
} }
} }
@ -1291,20 +1291,20 @@ Initialize (int argc, TCHAR* argv[])
static VOID Cleanup (int argc, TCHAR *argv[]) static VOID Cleanup (int argc, TCHAR *argv[])
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* run cmdexit.bat */ /* run cmdexit.bat */
if (IsExistingFile (_T("cmdexit.bat"))) if (IsExistingFile (_T("cmdexit.bat")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
ParseCommandLine (_T("\\cmdexit.bat")); ParseCommandLine (_T("\\cmdexit.bat"));
} }
#ifndef __REACTOS__ #ifndef __REACTOS__
@ -1320,8 +1320,8 @@ static VOID Cleanup (int argc, TCHAR *argv[])
if (IsExistingFile (_T("commandline"))) if (IsExistingFile (_T("commandline")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, commandline); ConErrPrintf (szMsg, commandline);
ParseCommandLine (commandline); ParseCommandLine (commandline);
} }
} }

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

@ -29,9 +29,9 @@
static VOID ColorHelp (VOID) static VOID ColorHelp (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
} }
@ -41,29 +41,29 @@ VOID SetScreenColor (WORD wColor, BOOL bFill)
DWORD dwWritten; DWORD dwWritten;
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
COORD coPos; COORD coPos;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if ((wColor & 0xF) == (wColor &0xF0) >> 4) if ((wColor & 0xF) == (wColor &0xF0) >> 4)
{ {
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
} }
else else
{ {
if (bFill == TRUE) if (bFill == TRUE)
{ {
GetConsoleScreenBufferInfo (hConsole, &csbi); GetConsoleScreenBufferInfo (hConsole, &csbi);
coPos.X = 0; coPos.X = 0;
coPos.Y = 0; coPos.Y = 0;
FillConsoleOutputAttribute (hConsole, FillConsoleOutputAttribute (hConsole,
(WORD)(wColor & 0x00FF), (WORD)(wColor & 0x00FF),
(csbi.dwSize.X)*(csbi.dwSize.Y), (csbi.dwSize.X)*(csbi.dwSize.Y),
coPos, coPos,
&dwWritten); &dwWritten);
} }
SetConsoleTextAttribute (hConsole, (WORD)(wColor & 0x00FF)); SetConsoleTextAttribute (hConsole, (WORD)(wColor & 0x00FF));
} }
} }
@ -74,7 +74,7 @@ VOID SetScreenColor (WORD wColor, BOOL bFill)
*/ */
INT CommandColor (LPTSTR first, LPTSTR rest) INT CommandColor (LPTSTR first, LPTSTR rest)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (rest, _T("/?"), 2) == 0) if (_tcsncmp (rest, _T("/?"), 2) == 0)
{ {
@ -92,18 +92,18 @@ INT CommandColor (LPTSTR first, LPTSTR rest)
if (StringToColor (&wColor, &rest) == FALSE) if (StringToColor (&wColor, &rest) == FALSE)
{ {
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
return 1; return 1;
} }
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, wColor); ConErrPrintf (szMsg, wColor);
if ((wColor & 0xF) == (wColor &0xF0) >> 4) if ((wColor & 0xF) == (wColor &0xF0) >> 4)
{ {
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, wColor); ConErrPrintf (szMsg, wColor);
return 1; return 1;
} }

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

@ -214,7 +214,7 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
DWORD ret; DWORD ret;
LPTSTR text; LPTSTR text;
va_list arg_ptr; va_list arg_ptr;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
va_start (arg_ptr, MessageId); va_start (arg_ptr, MessageId);
ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
@ -233,8 +233,8 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
} }

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

@ -301,13 +301,13 @@ Overwrite (LPTSTR fn)
LPTSTR lpOptions; LPTSTR lpOptions;
TCHAR Options[3]; TCHAR Options[3];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) Options,sizeof(Options)+sizeof(WCHAR)); LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, Options,sizeof(Options)/sizeof(TCHAR));
lpOptions = _T(Options); lpOptions = Options;
LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf (szMsg);
ConInString (inp, 10); ConInString (inp, 10);
ConOutPuts (_T("")); ConOutPuts (_T(""));
@ -339,7 +339,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
DWORD dwWritten; DWORD dwWritten;
DWORD i; DWORD i;
BOOL bEof = FALSE; BOOL bEof = FALSE;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("checking mode\n")); DebugPrintf (_T("checking mode\n"));
@ -351,8 +351,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, source); ConErrPrintf (szMsg, source);
return 0; return 0;
} }
@ -379,8 +379,8 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
{ {
if (!_tcscmp (dest, source)) if (!_tcscmp (dest, source))
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, source); ConErrPrintf (szMsg, source);
CloseHandle (hFileSrc); CloseHandle (hFileSrc);
return 0; return 0;
@ -456,8 +456,8 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
if (dwWritten != dwRead) if (dwWritten != dwRead)
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
free (buffer); free (buffer);
CloseHandle (hFileDest); CloseHandle (hFileDest);
@ -638,7 +638,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
TCHAR dir_d[_MAX_DIR]; TCHAR dir_d[_MAX_DIR];
TCHAR file_d[_MAX_FNAME]; TCHAR file_d[_MAX_FNAME];
TCHAR ext_d[_MAX_EXT]; TCHAR ext_d[_MAX_EXT];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
int argc; int argc;
int append; int append;
@ -655,8 +655,8 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 1; return 1;
} }
@ -728,8 +728,8 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
} }
else if (bDestFound && bWildcards) else if (bDestFound && bWildcards)
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
DeleteFileList (sources); DeleteFileList (sources);
freep (p); freep (p);

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

@ -47,24 +47,24 @@ static WORD awMonths[2][13] =
static VOID static VOID
PrintDateString (VOID) PrintDateString (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
switch (nDateFormat) switch (nDateFormat)
{ {
case 0: /* mmddyy */ case 0: /* mmddyy */
default: default:
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); ConOutPrintf (szMsg, cDateSeparator, cDateSeparator);
break; break;
case 1: /* ddmmyy */ case 1: /* ddmmyy */
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); ConOutPrintf (szMsg, cDateSeparator, cDateSeparator);
break; break;
case 2: /* yymmdd */ case 2: /* yymmdd */
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator); ConOutPrintf (szMsg, cDateSeparator, cDateSeparator);
break; break;
} }
} }
@ -189,12 +189,12 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
INT i; INT i;
BOOL bPrompt = TRUE; BOOL bPrompt = TRUE;
INT nDateString = -1; INT nDateString = -1;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -247,8 +247,8 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
freep (arg); freep (arg);
return 0; return 0;
} }
LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
} }

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

@ -111,22 +111,22 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
LPTSTR lpOptions; LPTSTR lpOptions;
TCHAR Options[11]; TCHAR Options[11];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LONG ch; LONG ch;
LoadString( GetModuleHandle(NULL), STRING_DEL_OPTION, (LPTSTR) Options,sizeof(Options)+sizeof(WCHAR)); LoadString( GetModuleHandle(NULL), STRING_DEL_OPTION, Options,sizeof(Options)/sizeof(TCHAR));
lpOptions = _T(Options); lpOptions = Options;
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, ConOutPrintf (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], 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],
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]
); );
return 0; return 0;
} }
@ -212,9 +212,9 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
res = FilePromptYN (_T( (LPTSTR) szMsg)); res = FilePromptYN (szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
break; break;
@ -231,8 +231,8 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
{ {
/* wildcards in filespec */ /* wildcards in filespec */
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf ((LPTSTR)szMsg);
#endif #endif
GetFullPathName (arg[i], GetFullPathName (arg[i],
@ -241,11 +241,11 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
&pFilePart); &pFilePart);
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, szFullPath); ConErrPrintf (szMsg, szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, pFilePart); ConErrPrintf (pFilePart);
#endif #endif
@ -268,18 +268,18 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
_tcscpy (pFilePart, f.cFileName); _tcscpy (pFilePart, f.cFileName);
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
#endif #endif
/* ask for deleting */ /* ask for deleting */
if (dwFlags & DEL_PROMPT) if (dwFlags & DEL_PROMPT)
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, szFullPath); ConErrPrintf (szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg,sizeof(szMsg)/sizeof(TCHAR));
res = FilePromptYN ((LPTSTR)szMsg); res = FilePromptYN (szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
{ {
@ -288,10 +288,10 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, szFullPath); ConErrPrintf (szMsg, szFullPath);
} }
/* delete the file */ /* delete the file */
if (!(dwFlags & DEL_NOTHING)) if (!(dwFlags & DEL_NOTHING))
@ -334,8 +334,8 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
{ {
/* no wildcards in filespec */ /* no wildcards in filespec */
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
#endif #endif
GetFullPathName (arg[i], GetFullPathName (arg[i],
MAX_PATH, MAX_PATH,
@ -345,11 +345,11 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
/*ask for deleting */ /*ask for deleting */
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 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)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, szFullPath); ConErrPrintf (szMsg, szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, szMsg,sizeof(szMsg)/sizeof(TCHAR));
res = FilePromptYN ((LPTSTR)szMsg); res = FilePromptYN (szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
{ {
@ -358,14 +358,14 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
} }
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, szFullPath); ConErrPrintf (szMsg, szFullPath);
#endif #endif
if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, szFullPath); ConErrPrintf (szMsg, szFullPath);
} }
if (!(dwFlags & DEL_NOTHING)) if (!(dwFlags & DEL_NOTHING))
{ {
@ -416,15 +416,15 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
if (!(dwFlags & DEL_QUIET)) if (!(dwFlags & DEL_QUIET))
{ {
if (dwFiles < 2) if (dwFiles < 2)
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
} }
ConOutPrintf ((LPTSTR)szMsg, dwFiles); ConOutPrintf (szMsg, dwFiles);
} }
return 0; return 0;

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

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

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

@ -210,9 +210,9 @@ static ULARGE_INTEGER recurse_bytes;
static VOID static VOID
DirHelp (VOID) DirHelp (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
} }
@ -228,13 +228,13 @@ DirReadParam (LPTSTR line, /* [IN] The line with the parameters & switches */
LPDIRSWITCHFLAGS lpFlags /* [IN/OUT] The flags after calculating switches */ LPDIRSWITCHFLAGS lpFlags /* [IN/OUT] The flags after calculating switches */
) )
{ {
TCHAR cCurSwitch; /* The current switch */ TCHAR cCurSwitch; /* The current switch */
TCHAR cCurChar; /* Current examing character */ TCHAR cCurChar; /* Current examing character */
TCHAR cCurUChar; /* Current upper examing character */ TCHAR cCurUChar; /* Current upper examing character */
BOOL bNegative; /* Negative switch */ BOOL bNegative; /* Negative switch */
BOOL bPNegative; /* Negative switch parameter */ BOOL bPNegative; /* Negative switch parameter */
BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */
LPTSTR ptrLast; /* A pointer to the last character of param */ LPTSTR ptrLast; /* A pointer to the last character of param */
/* Initialize variables; */ /* Initialize variables; */
cCurSwitch = _T(' '); cCurSwitch = _T(' ');
@ -773,7 +773,7 @@ PrintDirectoryHeader (LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
TCHAR szVolName[80]; TCHAR szVolName[80];
DWORD dwSerialNr; DWORD dwSerialNr;
LPTSTR p; LPTSTR p;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (lpFlags->bBareFormat) if (lpFlags->bBareFormat)
return(TRUE); return(TRUE);
@ -828,22 +828,22 @@ PrintDirectoryHeader (LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
if (szVolName[0] != _T('\0')) if (szVolName[0] != _T('\0'))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, szRootName[0], szVolName); ConOutPrintf (szMsg, szRootName[0], szVolName);
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)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,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, ConOutPrintf (szMsg,
HIWORD(dwSerialNr), HIWORD(dwSerialNr),
LOWORD(dwSerialNr)); LOWORD(dwSerialNr));
@ -926,11 +926,11 @@ DirPrintFileDateTime (TCHAR * lpDate,
LPWIN32_FIND_DATA lpFile, LPWIN32_FIND_DATA lpFile,
LPDIRSWITCHFLAGS lpFlags) LPDIRSWITCHFLAGS lpFlags)
{ {
FILETIME ft; FILETIME ft;
SYSTEMTIME dt; SYSTEMTIME dt;
TCHAR szDate[30]; TCHAR szDate[30];
TCHAR szTime[30]; TCHAR szTime[30];
WORD wYear; WORD wYear;
/* Select the right time field */ /* Select the right time field */
switch (lpFlags->stTimeField.eTimeField) switch (lpFlags->stTimeField.eTimeField)
@ -1053,10 +1053,10 @@ PrintSummary(LPTSTR szPath,
LPINT pLine, LPINT pLine,
LPDIRSWITCHFLAGS lpFlags) LPDIRSWITCHFLAGS lpFlags)
{ {
TCHAR szBuffer[64]; TCHAR szBuffer[64];
ULARGE_INTEGER uliFree; ULARGE_INTEGER uliFree;
TCHAR szRoot[] = _T("A:\\"); TCHAR szRoot[] = _T("A:\\");
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* Here we check if we didn't find anything */ /* Here we check if we didn't find anything */
@ -1074,16 +1074,16 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
{ {
ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg,ulFiles, szBuffer); ConOutPrintf (szMsg,ulFiles, szBuffer);
} }
/* Print total directories and freespace */ /* Print total directories and freespace */
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,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg,ulDirs, szBuffer); ConOutPrintf (szMsg,ulDirs, szBuffer);
return 0; return 0;
} }
@ -1096,8 +1096,8 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR* getExt(const TCHAR* file) TCHAR* getExt(const TCHAR* file)
{ {
TCHAR* tmp = _tcsrchr(file,'.'); TCHAR* tmp = _tcsrchr(file,_T('.'));
return tmp?tmp+1:""; return tmp?tmp+1:_T("");
} }
/* /*
@ -1169,13 +1169,13 @@ ULARGE_INTEGER u64FileSize; /* The file size */
/* Calculate short name */ /* Calculate short name */
szShortName[0] = _T('\0'); szShortName[0] = _T('\0');
if (lpFlags->bShortName) if (lpFlags->bShortName)
_stprintf(szShortName," %-12s", ptrFiles[i]->cAlternateFileName); _stprintf(szShortName,_T(" %-12s"), ptrFiles[i]->cAlternateFileName);
/* Format date and time */ /* Format date and time */
DirPrintFileDateTime(szDate,szTime,ptrFiles[i],lpFlags); DirPrintFileDateTime(szDate,szTime,ptrFiles[i],lpFlags);
/* Print the line */ /* Print the line */
ConOutPrintf("%10s %-8s %*s%s %s\n", ConOutPrintf(_T("%10s %-8s %*s%s %s\n"),
szDate, szDate,
szTime, szTime,
iSizeFormat, iSizeFormat,
@ -1244,13 +1244,13 @@ TCHAR szTempFname[MAX_PATH]; /* Temporary string */
DWORD temp = (j*iLines)+i; DWORD temp = (j*iLines)+i;
if (temp >= dwCount) break; if (temp >= dwCount) break;
if (ptrFiles[temp]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (ptrFiles[temp]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
_stprintf(szTempFname, "[%s]", ptrFiles[temp]->cFileName); _stprintf(szTempFname, _T("[%s]"), ptrFiles[temp]->cFileName);
else else
_stprintf(szTempFname, "%s", ptrFiles[temp]->cFileName); _stprintf(szTempFname, _T("%s"), ptrFiles[temp]->cFileName);
ConOutPrintf("%-*s",iBiggestName + 1 , szTempFname ); ConOutPrintf(_T("%-*s"),iBiggestName + 1 , szTempFname );
} }
ConOutPrintf("\n"); ConOutPrintf(_T("\n"));
} }
} }
/* Print Line sorted */ /* Print Line sorted */
@ -1259,18 +1259,18 @@ TCHAR szTempFname[MAX_PATH]; /* Temporary string */
for (i = 0;i < dwCount;i++) for (i = 0;i < dwCount;i++)
{ {
if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
_stprintf(szTempFname, "[%s]", ptrFiles[i]->cFileName); _stprintf(szTempFname, _T("[%s]"), ptrFiles[i]->cFileName);
else else
_stprintf(szTempFname, "%s", ptrFiles[i]->cFileName); _stprintf(szTempFname, _T("%s"), ptrFiles[i]->cFileName);
ConOutPrintf("%-*s", iBiggestName + 1, szTempFname ); ConOutPrintf(_T("%-*s"), iBiggestName + 1, szTempFname );
/* We print a new line at the end of each column /* We print a new line at the end of each column
except for the case that it is the last item.*/ except for the case that it is the last item.*/
if (!((i+1)%iColumns) && (i < (dwCount-1))) if (!((i+1)%iColumns) && (i < (dwCount-1)))
ConOutPrintf("\n"); ConOutPrintf(_T("\n"));
} }
/* Add a new line after the last item */ /* Add a new line after the last item */
ConOutPrintf("\n"); ConOutPrintf(_T("\n"));
} }
return 0; return 0;
} }
@ -1329,7 +1329,7 @@ ULARGE_INTEGER u64FileSize; /* The file size */
DirPrintFileDateTime(szDate,szTime,ptrFiles[i],lpFlags); DirPrintFileDateTime(szDate,szTime,ptrFiles[i],lpFlags);
/* Print the line */ /* Print the line */
ConOutPrintf("%-8s %-3s %*s %s %s\n", ConOutPrintf(_T("%-8s %-3s %*s %s %s\n"),
szName, /* The file's 8.3 name */ szName, /* The file's 8.3 name */
szExt, /* The file's 8.3 extension */ szExt, /* The file's 8.3 extension */
iSizeFormat, /* print format for size column */ iSizeFormat, /* print format for size column */
@ -1367,11 +1367,11 @@ TCHAR szFullName[MAX_PATH]; /* The fullpath name of file */
{ {
_tcscpy(szFullName, szCurPath); _tcscpy(szFullName, szCurPath);
_tcscat(szFullName, ptrFiles[i]->cFileName); _tcscat(szFullName, ptrFiles[i]->cFileName);
ConOutPrintf("%s\n", szFullName); ConOutPrintf(_T("%s\n"), szFullName);
} }
/* if we are not in recursive mode we print the file names */ /* if we are not in recursive mode we print the file names */
else else
ConOutPrintf("%s\n",ptrFiles[i]->cFileName); ConOutPrintf(_T("%s\n"),ptrFiles[i]->cFileName);
} }
return 0; return 0;
} }
@ -1388,7 +1388,7 @@ DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */
LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */
{ {
TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* Print directory header */ /* Print directory header */
_tcscpy(szTemp, szCurPath); _tcscpy(szTemp, szCurPath);
@ -1399,8 +1399,8 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP7, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf (_T( (LPTSTR)szMsg), szTemp); ConOutPrintf (szMsg, szTemp);
} }
/* Bare format */ /* Bare format */
@ -1478,10 +1478,10 @@ long iComp = 0; /* The comparison result */
(lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
break; break;
case ORDER_EXTENSION: /* Order by extension name /o:e */ case ORDER_EXTENSION: /* Order by extension name /o:e */
iComp = _stricmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName));
break; break;
case ORDER_NAME: /* Order by filename /o:n */ case ORDER_NAME: /* Order by filename /o:n */
iComp = _stricmp(lpFile1->cFileName, lpFile2->cFileName); iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName);
break; break;
case ORDER_TIME: /* Order by file's time /o:t */ case ORDER_TIME: /* Order by file's time /o:t */
@ -1610,7 +1610,7 @@ DWORD dwCountFiles; /* Counter for files */
DWORD dwCountDirs; /* Counter for directories */ DWORD dwCountDirs; /* Counter for directories */
ULARGE_INTEGER u64CountBytes; /* Counter for bytes */ ULARGE_INTEGER u64CountBytes; /* Counter for bytes */
ULARGE_INTEGER u64Temp; /* A temporary counter */ ULARGE_INTEGER u64Temp; /* A temporary counter */
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* Initialize Variables */ /* Initialize Variables */
ptrStartNode = NULL; ptrStartNode = NULL;
@ -1728,8 +1728,8 @@ WCHAR 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg,dwCountFiles, szBytes); ConOutPrintf (szMsg,dwCountFiles, szBytes);
} }
/* Add statistics to recursive statistics*/ /* Add statistics to recursive statistics*/
@ -1751,8 +1751,8 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
if (hRecSearch != INVALID_HANDLE_VALUE) if (hRecSearch != INVALID_HANDLE_VALUE)
{ {
/* We search for directories other than "." and ".." */ /* We search for directories other than "." and ".." */
if ((_stricmp(wfdFileInfo.cFileName, _T(".")) != 0) if ((_tcsicmp(wfdFileInfo.cFileName, _T(".")) != 0)
&& (_stricmp(wfdFileInfo.cFileName, _T("..")) != 0 ) && (_tcsicmp(wfdFileInfo.cFileName, _T("..")) != 0 )
&& (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) && (wfdFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{ {
/* Concat the path and the directory to do recursive */ /* Concat the path and the directory to do recursive */

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

@ -140,12 +140,12 @@ INT CommandPushd (LPTSTR first, LPTSTR rest)
TCHAR curPath[MAX_PATH]; TCHAR curPath[MAX_PATH];
TCHAR newPath[MAX_PATH]; TCHAR newPath[MAX_PATH];
BOOL bChangePath = FALSE; BOOL bChangePath = FALSE;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -173,12 +173,12 @@ INT CommandPushd (LPTSTR first, LPTSTR rest)
INT CommandPopd (LPTSTR first, LPTSTR rest) INT CommandPopd (LPTSTR first, LPTSTR rest)
{ {
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp(rest, _T("/?"), 2)) if (!_tcsncmp(rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -201,12 +201,12 @@ INT CommandPopd (LPTSTR first, LPTSTR rest)
INT CommandDirs (LPTSTR first, LPTSTR rest) INT CommandDirs (LPTSTR first, LPTSTR rest)
{ {
LPDIRENTRY lpDir; LPDIRENTRY lpDir;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp(rest, _T("/?"), 2)) if (!_tcsncmp(rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -216,8 +216,8 @@ INT CommandDirs (LPTSTR first, LPTSTR rest)
if (lpDir == NULL) if (lpDir == NULL)
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -33,7 +33,7 @@
INT CommandEcho (LPTSTR cmd, LPTSTR param) INT CommandEcho (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param); DebugPrintf (_T("CommandEcho '%s' : '%s'\n"), cmd, param);
@ -41,8 +41,8 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -62,8 +62,8 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
else if (*param) else if (*param)
ConOutPuts (param); ConOutPuts (param);
else { else {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, bEcho ? D_ON : D_OFF); ConOutPrintf (szMsg, bEcho ? D_ON : D_OFF);
} }
} }
@ -72,7 +72,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
INT CommandEchos (LPTSTR cmd, LPTSTR param) INT CommandEchos (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; 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);
@ -80,8 +80,8 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }
@ -95,7 +95,7 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param)
INT CommandEchoerr (LPTSTR cmd, LPTSTR param) INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; 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 +103,8 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts((LPTSTR)szMsg);
return 0; return 0;
} }
@ -126,7 +126,7 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
INT CommandEchoserr (LPTSTR cmd, LPTSTR param) INT CommandEchoserr (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; 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);
@ -136,8 +136,8 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }

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

@ -47,7 +47,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
LPTSTR szError; LPTSTR szError;
#endif #endif
va_list arg_ptr; va_list arg_ptr;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (dwErrorCode == ERROR_SUCCESS) if (dwErrorCode == ERROR_SUCCESS)
return; return;
@ -71,8 +71,8 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, dwErrorCode); ConErrPrintf (szMsg, dwErrorCode);
return; return;
} }
@ -81,20 +81,20 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg,sizeof(szMsg)/sizeof(TCHAR));
break; break;
case ERROR_PATH_NOT_FOUND: case ERROR_PATH_NOT_FOUND:
LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, szMsg,sizeof(szMsg)/sizeof(TCHAR));
break; break;
case ERROR_NOT_READY: case ERROR_NOT_READY:
LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVER_NOT_READY, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_DRIVER_NOT_READY, szMsg,sizeof(szMsg)/sizeof(TCHAR));
break; break;
default: default:
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
return; return;
} }
@ -107,117 +107,115 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
VOID error_parameter_format(TCHAR ch) VOID error_parameter_format(TCHAR ch)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, ch); ConErrPrintf (szMsg, ch);
} }
VOID error_invalid_switch (TCHAR ch) VOID error_invalid_switch (TCHAR ch)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, ch); ConErrPrintf (szMsg, ch);
} }
VOID error_too_many_parameters (LPTSTR s) VOID error_too_many_parameters (LPTSTR s)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, s); ConErrPrintf (szMsg, s);
} }
VOID error_path_not_found (VOID) VOID error_path_not_found (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
VOID error_file_not_found (VOID) VOID error_file_not_found (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf ((LPTSTR)szMsg);
} }
VOID error_sfile_not_found (LPTSTR f) VOID error_sfile_not_found (LPTSTR f)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ("%s - %s\n", (LPTSTR)szMsg,f); ConErrPrintf (_T("%s - %s\n"), szMsg,f);
} }
VOID error_req_param_missing (VOID) VOID error_req_param_missing (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
VOID error_invalid_drive (VOID) VOID error_invalid_drive (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
VOID error_bad_command (VOID) VOID error_bad_command (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
VOID error_no_pipe (VOID) VOID error_no_pipe (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
VOID error_out_of_memory (VOID) VOID error_out_of_memory (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
} }
VOID error_invalid_parameter_format (LPTSTR s) VOID error_invalid_parameter_format (LPTSTR s)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, s); ConErrPrintf (szMsg, s);
} }
VOID error_syntax (LPTSTR s) VOID error_syntax (LPTSTR s)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
if (s) if (s)
ConErrPrintf (_T("%s - %s\n"),(LPTSTR)szMsg, s); ConErrPrintf (_T("%s - %s\n"),szMsg, s);
else else
ConErrPrintf (_T("%s.\n"), (LPTSTR)szMsg ); ConErrPrintf (_T("%s.\n"), szMsg );
} }
VOID msg_pause (VOID) VOID msg_pause (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
} }

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

@ -53,7 +53,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
LPBATCH_CONTEXT lpNew; LPBATCH_CONTEXT lpNew;
LPTSTR pp; LPTSTR pp;
TCHAR var; TCHAR var;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param); DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param);
@ -61,8 +61,8 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_FOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FOR_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -83,8 +83,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
error_syntax ((LPTSTR)szMsg); error_syntax (szMsg);
return 1; return 1;
} }
@ -95,8 +95,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
error_syntax ((LPTSTR)szMsg); error_syntax (szMsg);
return 1; return 1;
} }
@ -110,8 +110,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
error_syntax ((LPTSTR)szMsg); error_syntax (szMsg);
return 1; return 1;
} }
@ -122,8 +122,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
error_syntax ((LPTSTR)szMsg); error_syntax (szMsg);
return 1; return 1;
} }

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

@ -71,13 +71,13 @@ PrintDiskInfo (LPTSTR szDisk)
DWORD dwBytPerSec; DWORD dwBytPerSec;
DWORD dwFreeCl; DWORD dwFreeCl;
DWORD dwTotCl; DWORD dwTotCl;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':')) if (_tcslen (szDisk) < 2 || szDisk[1] != _T(':'))
{ {
LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
return; return;
} }
@ -88,16 +88,16 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf (_T("%s %s:\n"),(LPTSTR)szMsg, szDrive); ConErrPrintf (_T("%s %s:\n"),szMsg, szDrive);
return; return;
} }
if (szVolume[0] == _T('\0')) if (szVolume[0] == _T('\0'))
{ {
LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
_tcscpy (szVolume, (LPTSTR) szMsg); _tcscpy (szVolume, szMsg);
} }
_stprintf (szSerial, _stprintf (szSerial,
@ -108,8 +108,8 @@ PrintDiskInfo (LPTSTR szDisk)
if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl, if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl,
&dwBytPerSec, &dwFreeCl, &dwTotCl)) &dwBytPerSec, &dwFreeCl, &dwTotCl))
{ {
LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FREE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf (_T("%s %s:\n"),(LPTSTR)szMsg, szDrive); ConErrPrintf (_T("%s %s:\n"),szMsg, szDrive);
return; return;
} }
@ -123,8 +123,8 @@ PrintDiskInfo (LPTSTR szDisk)
ConvertULargeInteger (uliSize, szFree, 40); ConvertULargeInteger (uliSize, szFree, 40);
LoadString( GetModuleHandle(NULL), STRING_FREE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FREE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg,szDrive, szVolume, szSerial,szTotal, szUsed, szFree); ConOutPrintf (szMsg,szDrive, szVolume, szSerial,szTotal, szUsed, szFree);
} }
@ -134,12 +134,12 @@ INT CommandFree (LPTSTR cmd, LPTSTR param)
TCHAR szDefPath[MAX_PATH]; TCHAR szDefPath[MAX_PATH];
INT argc, i; INT argc, i;
LPTSTR *arg; LPTSTR *arg;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_FREE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_FREE_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -41,7 +41,7 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
{ {
LPTSTR tmp; LPTSTR tmp;
LONG lNewPosHigh; LONG lNewPosHigh;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param); DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param);
@ -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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_GOTO_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -64,8 +64,8 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
if (*param == _T('\0')) if (*param == _T('\0'))
{ {
LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ExitBatch ((LPTSTR)szMsg); ExitBatch (szMsg);
return 1; return 1;
} }
@ -97,8 +97,8 @@ INT cmd_goto (LPTSTR cmd, LPTSTR param)
return 0; return 0;
} }
LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_GOTO_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg,param); ConErrPrintf (szMsg,param);
ExitBatch (NULL); ExitBatch (NULL);
return 1; return 1;

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

@ -41,7 +41,7 @@ INT cmd_if (LPTSTR cmd, LPTSTR param)
{ {
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;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_if: (\'%S\', \'%S\')\n"), cmd, param); DebugPrintf (_T("cmd_if: (\'%S\', \'%S\')\n"), cmd, param);
@ -49,8 +49,8 @@ INT cmd_if (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_IF_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_IF_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }

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

@ -158,15 +158,15 @@ INT cmd_chdir (LPTSTR cmd, LPTSTR param)
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 */
LPTSTR lastquote; /* pointer to the last quotation mark in the directory to change to */ LPTSTR lastquote; /* pointer to the last quotation mark in the directory to change to */
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/*Should we better declare a variable containing _tsclen(dir) ? It's used a few times, /*Should we better declare a variable containing _tsclen(dir) ? It's used a few times,
but on the other hand paths are generally not very long*/ but on the other hand paths are generally not very long*/
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CD_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString(GetModuleHandle(NULL), STRING_CD_HELP, szMsg, sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -279,12 +279,12 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
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;
INT argc; INT argc;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_MKDIR_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MKDIR_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -320,8 +320,8 @@ INT cmd_mkdir (LPTSTR cmd, LPTSTR param)
if (!dir) if (!dir)
{ {
LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, szMsg, sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf (szMsg);
return 1; return 1;
} }
@ -358,13 +358,13 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
INT argc; INT argc;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_RMDIR_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_RMDIR_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -399,8 +399,8 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
if (!dir) if (!dir)
{ {
LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_PARAM_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf (szMsg);
return 1; return 1;
} }
@ -430,12 +430,12 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param)
*/ */
INT CommandExit (LPTSTR cmd, LPTSTR param) INT CommandExit (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_EXIT_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_EXIT_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -451,12 +451,12 @@ INT CommandExit (LPTSTR cmd, LPTSTR param)
*/ */
INT CommandRem (LPTSTR cmd, LPTSTR param) INT CommandRem (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_REM_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_REM_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts (szMsg);
} }
return 0; return 0;

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

@ -31,7 +31,7 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
DWORD dwSerialNr; DWORD dwSerialNr;
LPTSTR *arg; LPTSTR *arg;
INT args; INT args;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* set empty label string */ /* set empty label string */
szLabel[0] = _T('\0'); szLabel[0] = _T('\0');
@ -39,8 +39,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf (szMsg);
return 0; return 0;
} }
@ -94,25 +94,25 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR) szMsg, _totupper (szRootPath[0]), szOldLabel); ConOutPrintf (szMsg, _totupper (szRootPath[0]), szOldLabel);
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR) 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LABEL_HELP5, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf (szMsg);
ConInString (szLabel, 80); ConInString (szLabel, 80);
} }

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

@ -33,24 +33,32 @@ VOID InitLocale (VOID)
/* date settings */ /* date settings */
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDATE, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDATE, szBuffer, 256);
CharToOem (szBuffer, szBuffer); #if !defined(_UNICODE) && !defined(UNICODE)
CharToOem (szBuffer, szBuffer);
#endif
cDateSeparator = szBuffer[0]; cDateSeparator = szBuffer[0];
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IDATE, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IDATE, szBuffer, 256);
nDateFormat = _ttoi (szBuffer); nDateFormat = _ttoi (szBuffer);
/* time settings */ /* time settings */
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STIME, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STIME, szBuffer, 256);
#if !defined(_UNICODE) && !defined(UNICODE)
CharToOem (szBuffer, szBuffer); CharToOem (szBuffer, szBuffer);
#endif
cTimeSeparator = szBuffer[0]; cTimeSeparator = szBuffer[0];
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_ITIME, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_ITIME, szBuffer, 256);
nTimeFormat = _ttoi (szBuffer); nTimeFormat = _ttoi (szBuffer);
/* number settings */ /* number settings */
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szBuffer, 256);
#if !defined(_UNICODE) && !defined(UNICODE)
CharToOem (szBuffer, szBuffer); CharToOem (szBuffer, szBuffer);
#endif
cThousandSeparator = szBuffer[0]; cThousandSeparator = szBuffer[0];
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szBuffer, 256);
#if !defined(_UNICODE) && !defined(UNICODE)
CharToOem (szBuffer, szBuffer); CharToOem (szBuffer, szBuffer);
#endif
cDecimalSeparator = szBuffer[0]; cDecimalSeparator = szBuffer[0];
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuffer, 256);
nNumberGroups = _ttoi (szBuffer); nNumberGroups = _ttoi (szBuffer);
@ -59,7 +67,9 @@ VOID InitLocale (VOID)
for (i = 0; i < 7; i++) for (i = 0; i < 7; i++)
{ {
GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, szBuffer, 256); GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, szBuffer, 256);
#if !defined(_UNICODE) && !defined(UNICODE)
CharToOem (szBuffer, szBuffer); CharToOem (szBuffer, szBuffer);
#endif
_tcscpy (aszDayNames[(i+1)%7], szBuffer); /* little hack */ _tcscpy (aszDayNames[(i+1)%7], szBuffer); /* little hack */
} }
#endif #endif
@ -149,24 +159,24 @@ VOID PrintTime (VOID)
{ {
#ifdef __REACTOS__ #ifdef __REACTOS__
SYSTEMTIME st; SYSTEMTIME st;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
GetLocalTime (&st); GetLocalTime (&st);
LoadString( GetModuleHandle(NULL), STRING_LOCALE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LOCALE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
switch (nTimeFormat) switch (nTimeFormat)
{ {
case 0: /* 12 hour format */ case 0: /* 12 hour format */
default: default:
ConOutPrintf (_T("%s %2d%c%02d%c%02d%c%02d%c\n"),(LPTSTR)szMsg, ConOutPrintf (_T("%s %2d%c%02d%c%02d%c%02d%c\n"),szMsg,
(st.wHour == 0 ? 12 : (st.wHour <= 12 ? st.wHour : st.wHour - 12)), (st.wHour == 0 ? 12 : (st.wHour <= 12 ? st.wHour : st.wHour - 12)),
cTimeSeparator, st.wMinute, cTimeSeparator, st.wSecond, cDecimalSeparator, cTimeSeparator, st.wMinute, cTimeSeparator, st.wSecond, cDecimalSeparator,
st.wMilliseconds / 10, (st.wHour <= 11 ? 'a' : 'p')); st.wMilliseconds / 10, (st.wHour <= 11 ? 'a' : 'p'));
break; break;
case 1: /* 24 hour format */ case 1: /* 24 hour format */
ConOutPrintf (_T("%s %2d%c%02d%c%02d%c%02d\n"),(LPTSTR)szMsg, ConOutPrintf (_T("%s %2d%c%02d%c%02d%c%02d\n"),szMsg,
st.wHour, cTimeSeparator, st.wMinute, cTimeSeparator, st.wHour, cTimeSeparator, st.wMinute, cTimeSeparator,
st.wSecond, cDecimalSeparator, st.wMilliseconds / 10); st.wSecond, cDecimalSeparator, st.wMilliseconds / 10);
break; break;
@ -174,10 +184,10 @@ VOID PrintTime (VOID)
#else #else
TCHAR szTime[32]; TCHAR szTime[32];
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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_LOCALE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf (_T("%s: %s\n"),(LPTSTR)szMsg, szTime); ConOutPrintf (_T("%s: %s\n"),(LPTSTR)szMsg, szTime);
#endif #endif
} }

2
reactos/subsys/system/cmd/makefile
View file

@ -18,7 +18,7 @@ TARGET_PCH = precomp.h
TARGET_INSTALLDIR = system32 TARGET_INSTALLDIR = system32
TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Wall -Werror \ TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Wall -Werror \
-I$(PATH_TO_TOP)/include/wine -D_WIN32_WINNT=0x0501 -I$(PATH_TO_TOP)/include/wine -D_WIN32_WINNT=0x0501 #-DUNICODE -D_UNICODE
TARGET_OBJECTS = \ TARGET_OBJECTS = \
cmd.o attrib.o alias.o batch.o beep.o call.o chcp.o choice.o \ cmd.o attrib.o alias.o batch.o beep.o call.o chcp.o choice.o \

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

@ -64,12 +64,12 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param)
TCHAR szAvailPageFile[20]; TCHAR szAvailPageFile[20];
TCHAR szTotalVirtual[20]; TCHAR szTotalVirtual[20];
TCHAR szAvailVirtual[20]; TCHAR szAvailVirtual[20];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -85,8 +85,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, ConOutPrintf (szMsg,
szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile,
szAvailPageFile, szTotalVirtual, szAvailVirtual); szAvailPageFile, szTotalVirtual, szAvailVirtual);

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

@ -438,10 +438,10 @@ HWND GetConsoleWindow (VOID)
INT PagePrompt (VOID) INT PagePrompt (VOID)
{ {
INPUT_RECORD ir; INPUT_RECORD ir;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_MISC_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MISC_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf((LPTSTR)szMsg); ConOutPrintf(szMsg);
RemoveBreakHandler (); RemoveBreakHandler ();
ConInDisable (); ConInDisable ();
@ -470,7 +470,7 @@ INT FilePromptYN (LPTSTR szFormat, ...)
{ {
TCHAR szOut[512]; TCHAR szOut[512];
va_list arg_ptr; va_list arg_ptr;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
// TCHAR cKey = 0; // TCHAR cKey = 0;
// LPTSTR szKeys = _T("yna"); // LPTSTR szKeys = _T("yna");
@ -489,17 +489,16 @@ INT FilePromptYN (LPTSTR szFormat, ...)
ConOutPrintf (_T("\n")); ConOutPrintf (_T("\n"));
_tcsupr (szIn); _tcsupr (szIn);
for (p = szIn; _istspace (*p); p++) for (p = szIn; _istspace (*p); p++);
;
LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_OPTION, szMsg,sizeof(szMsg)/sizeof(TCHAR));
if (wcsncmp(((WCHAR*) p),&szMsg[0],1)==0) if (_tcsncmp(p,&szMsg[0],1)==0)
return PROMPT_YES; return PROMPT_YES;
else if (wcsncmp(((WCHAR*) p),&szMsg[1],1)==0) else if (_tcsncmp(p,&szMsg[1],1)==0)
return PROMPT_NO; return PROMPT_NO;
#if 0 #if 0
@ -547,7 +546,7 @@ INT FilePromptYNA (LPTSTR szFormat, ...)
va_list arg_ptr; va_list arg_ptr;
// TCHAR cKey = 0; // TCHAR cKey = 0;
// LPTSTR szKeys = _T("yna"); // LPTSTR szKeys = _T("yna");
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szIn[10]; TCHAR szIn[10];
@ -564,18 +563,17 @@ INT FilePromptYNA (LPTSTR szFormat, ...)
ConOutPrintf (_T("\n")); ConOutPrintf (_T("\n"));
_tcsupr (szIn); _tcsupr (szIn);
for (p = szIn; _istspace (*p); p++) for (p = szIn; _istspace (*p); p++);
;
LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szMsg,sizeof(szMsg)/sizeof(TCHAR));
if (wcsncmp(((WCHAR*) p),&szMsg[0],1)==0) if (_tcsncmp(p,&szMsg[0],1)==0)
return PROMPT_YES; return PROMPT_YES;
else if (wcsncmp(((WCHAR*) p),&szMsg[1],1)==0) else if (_tcsncmp(p,&szMsg[1],1)==0)
return PROMPT_NO; return PROMPT_NO;
else if (wcsncmp( ((WCHAR*) p),&szMsg[2],1)==0) else if (_tcsncmp(p,&szMsg[2],1)==0)
return PROMPT_ALL; return PROMPT_ALL;
#if 0 #if 0
else if (*p == _T('\03')) else if (*p == _T('\03'))

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

@ -41,10 +41,10 @@ static INT Overwrite (LPTSTR fn)
{ {
TCHAR inp[10]; TCHAR inp[10];
LPTSTR p; LPTSTR p;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_MOVE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, fn); ConOutPrintf (szMsg, fn);
ConInString (inp, 10); ConInString (inp, 10);
_tcsupr (inp); _tcsupr (inp);
@ -73,7 +73,7 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
HANDLE hFile; HANDLE hFile;
LPTSTR pszFile; LPTSTR pszFile;
BOOL bNothing = FALSE; BOOL bNothing = FALSE;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
@ -92,8 +92,8 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
" /-Y\n" " /-Y\n"
"...")); "..."));
#else #else
LoadString( GetModuleHandle(NULL), STRING_MOVE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
#endif #endif
return 0; return 0;
} }
@ -101,7 +101,7 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
arg = split (param, &argc, FALSE); arg = split (param, &argc, FALSE);
nFiles = argc; nFiles = argc;
LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, szMsg,sizeof(szMsg)/sizeof(TCHAR));
/* read options */ /* read options */
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
@ -114,14 +114,14 @@ INT cmd_move (LPTSTR cmd, LPTSTR param)
if (*p == _T('-')) if (*p == _T('-'))
{ {
p++; p++;
if ((WCHAR*) _totupper (*p) == &szMsg[0]) if (_totupper (*p) == szMsg[0])
bPrompt = TRUE; bPrompt = TRUE;
} }
else else
{ {
if ((WCHAR*) _totupper (*p) == &szMsg[0]) if (_totupper (*p) == szMsg[0])
bPrompt = FALSE; bPrompt = FALSE;
else if ((WCHAR*) _totupper (*p) == &szMsg[1]) else if (_totupper (*p) == szMsg[1])
bNothing = TRUE; bNothing = TRUE;
} }
nFiles--; nFiles--;
@ -194,9 +194,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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
else else
LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf ((LPTSTR)szMsg);
} }
@ -218,9 +218,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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
else else
LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf ((LPTSTR)szMsg);
} }
} }
@ -238,10 +238,10 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
else else
LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MOVE_ERROR2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf ((LPTSTR)szMsg);
} }
} }
} }

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

@ -32,7 +32,7 @@ INT CommandMsgbox (LPTSTR cmd, LPTSTR param)
//and to find window handle to pass to MessageBox //and to find window handle to pass to MessageBox
HWND hWnd; HWND hWnd;
TCHAR buff[128]; TCHAR buff[128];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
//these are MessabeBox() parameters //these are MessabeBox() parameters
LPTSTR title, prompt=""; LPTSTR title, prompt="";
@ -44,8 +44,8 @@ INT CommandMsgbox (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_MSGBOX_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_MSGBOX_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }

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

@ -36,12 +36,12 @@
INT cmd_path (LPTSTR cmd, LPTSTR param) INT cmd_path (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_PATH_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_PATH_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -56,8 +56,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_PATH_ERROR, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg); ConErrPrintf (szMsg);
return 0; return 0;
} }
else if (dwBuffer > ENV_BUFFER_SIZE) else if (dwBuffer > ENV_BUFFER_SIZE)

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

@ -37,7 +37,7 @@
INT cmd_pause (LPTSTR cmd, LPTSTR param) INT cmd_pause (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; 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 +45,8 @@ INT cmd_pause (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_PAUSE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_PAUSE_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

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

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

@ -58,14 +58,14 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
HANDLE hFile; HANDLE hFile;
WIN32_FIND_DATA f; WIN32_FIND_DATA f;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp(param, _T("/?"), 2)) if (!_tcsncmp(param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_REN_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_REN_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return(0); return(0);
} }
/* split the argument list */ /* split the argument list */
@ -239,8 +239,8 @@ INT cmd_rename (LPTSTR cmd, LPTSTR param)
{ {
if (!(dwFlags & REN_ERROR)) if (!(dwFlags & REN_ERROR))
{ {
LoadString( GetModuleHandle(NULL), STRING_REN_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_REN_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPrintf ((LPTSTR)szMsg, GetLastError()); ConErrPrintf (szMsg, GetLastError());
} }
} }
} }
@ -252,11 +252,11 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_REN_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
else else
LoadString( GetModuleHandle(NULL), STRING_REN_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_REN_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf((LPTSTR)szMsg,dwFiles); ConOutPrintf(szMsg,dwFiles);
} }

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

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

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

@ -47,12 +47,12 @@
INT cmd_set (LPTSTR cmd, LPTSTR param) INT cmd_set (LPTSTR cmd, LPTSTR param)
{ {
LPTSTR p; LPTSTR p;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_SET_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_SET_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -39,7 +39,7 @@
INT cmd_shift (LPTSTR cmd, LPTSTR param) INT cmd_shift (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; 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 +47,8 @@ INT cmd_shift (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_SHIFT_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_SHIFT_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }

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

@ -22,13 +22,13 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
TCHAR szFullName[MAX_PATH]; TCHAR szFullName[MAX_PATH];
BOOL bWait = FALSE; BOOL bWait = FALSE;
TCHAR *param; TCHAR *param;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (rest, _T("/?"), 2) == 0) if (_tcsncmp (rest, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_START_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_START_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }
@ -73,8 +73,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_START_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
} }
else else
{ {

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

@ -137,13 +137,13 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
INT i; INT i;
BOOL bPrompt = TRUE; BOOL bPrompt = TRUE;
INT nTimeString = -1; INT nTimeString = -1;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_TIME_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TIME_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }
@ -175,8 +175,8 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
{ {
TCHAR s[40]; TCHAR s[40];
LoadString( GetModuleHandle(NULL), STRING_TIME_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TIME_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg); ConOutPrintf (szMsg);
ConInString (s, 40); ConInString (s, 40);
@ -204,8 +204,8 @@ INT cmd_time (LPTSTR cmd, LPTSTR param)
/* force input the next time around. */ /* force input the next time around. */
nTimeString = -1; nTimeString = -1;
} }
LoadString( GetModuleHandle(NULL), STRING_TIME_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TIME_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
} }
freep (arg); freep (arg);

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

@ -37,7 +37,7 @@
static VOID static VOID
PrintElapsedTime (DWORD time,INT format) PrintElapsedTime (DWORD time,INT format)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
DWORD h,m,s,ms; DWORD h,m,s,ms;
#ifdef _DEBUG #ifdef _DEBUG
@ -47,8 +47,8 @@ PrintElapsedTime (DWORD time,INT format)
switch (format) switch (format)
{ {
case 0: case 0:
LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf((LPTSTR)szMsg,time); ConOutPrintf(szMsg,time);
break; break;
case 1: case 1:
@ -58,8 +58,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf((LPTSTR)szMsg, ConOutPrintf(szMsg,
h,cTimeSeparator, h,cTimeSeparator,
m,cTimeSeparator, m,cTimeSeparator,
s,cDecimalSeparator,ms/10); s,cDecimalSeparator,ms/10);
@ -70,7 +70,7 @@ PrintElapsedTime (DWORD time,INT format)
INT CommandTimer (LPTSTR cmd, LPTSTR param) INT CommandTimer (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
// all timers are kept // all timers are kept
static DWORD clksT[10]; static DWORD clksT[10];
@ -104,8 +104,8 @@ INT CommandTimer (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TIMER_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg,cTimeSeparator,cTimeSeparator,cDecimalSeparator); ConOutPrintf (szMsg,cTimeSeparator,cTimeSeparator,cDecimalSeparator);
return 0; return 0;
} }

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

@ -17,7 +17,7 @@
INT cmd_title (LPTSTR cmd, LPTSTR param) INT cmd_title (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; 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 +26,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TITLE_HELP, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts((LPTSTR)szMsg); ConOutPuts(szMsg);
return 0; return 0;
} }

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

@ -42,14 +42,14 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
INT argc,i; INT argc,i;
LPTSTR *argv; LPTSTR *argv;
LPTSTR errmsg; LPTSTR errmsg;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE); hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE);
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_TYPE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TYPE_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -66,7 +66,7 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
if (_T('/') == argv[i][0]) if (_T('/') == argv[i][0])
{ {
LoadString( GetModuleHandle(NULL), STRING_TYPE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_TYPE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf ((LPTSTR)szMsg, argv[i] + 1); ConErrPrintf (szMsg, argv[i] + 1);
continue; continue;
} }
hFile = CreateFile(argv[i], hFile = CreateFile(argv[i],

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

@ -64,14 +64,14 @@ VOID ShortVersion (VOID)
INT cmd_ver (LPTSTR cmd, LPTSTR param) INT cmd_ver (LPTSTR cmd, LPTSTR param)
{ {
INT i; INT i;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
WCHAR rosdev[RC_STRING_MAX_SIZE]; TCHAR rosdev[RC_STRING_MAX_SIZE];
WCHAR fredev[RC_STRING_MAX_SIZE]; TCHAR fredev[RC_STRING_MAX_SIZE];
if (_tcsstr (param, _T("/?")) != NULL) if (_tcsstr (param, _T("/?")) != NULL)
{ {
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -84,8 +84,8 @@ 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
} }
else else
{ {
@ -110,22 +110,22 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
{ {
/* Warranty notice */ /* Warranty notice */
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg); 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, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
} }
else if (_totupper (param[i]) == _T('C')) else if (_totupper (param[i]) == _T('C'))
{ {
/* Developer listing */ /* Developer listing */
LoadString( GetModuleHandle(NULL), STRING_REACTOS_DEV, (LPTSTR) rosdev,sizeof(rosdev)); LoadString( GetModuleHandle(NULL), STRING_REACTOS_DEV, rosdev,sizeof(rosdev)/sizeof(TCHAR));
LoadString( GetModuleHandle(NULL), STRING_FreeDOS_DEV, (LPTSTR) fredev,sizeof(fredev)); LoadString( GetModuleHandle(NULL), STRING_FreeDOS_DEV, fredev,sizeof(fredev)/sizeof(TCHAR));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP6, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf ((LPTSTR)szMsg,fredev,rosdev); ConOutPrintf ((LPTSTR)szMsg,fredev,rosdev);
/* /*
ConOutPuts (_T("\n" ConOutPuts (_T("\n"
@ -151,7 +151,7 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
} }
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP5, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -30,27 +30,27 @@ static BOOL bVerify = FALSE;
INT cmd_verify (LPTSTR cmd, LPTSTR param) INT cmd_verify (LPTSTR cmd, LPTSTR param)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
if (!*param) if (!*param)
{ {
LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, bVerify ? D_ON : D_OFF); ConOutPrintf (szMsg, bVerify ? D_ON : D_OFF);
} }
else if (_tcsicmp (param, D_OFF) == 0) else if (_tcsicmp (param, D_OFF) == 0)
bVerify = FALSE; bVerify = FALSE;
else if (_tcsicmp (param, D_ON) == 0) else if (_tcsicmp (param, D_ON) == 0)
bVerify = TRUE; bVerify = TRUE;
else else
LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }

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

@ -31,7 +31,7 @@ PrintVolumeHeader (LPTSTR pszRootPath)
{ {
TCHAR szVolName[80]; TCHAR szVolName[80];
DWORD dwSerialNr; DWORD dwSerialNr;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
/* get the volume information of the drive */ /* get the volume information of the drive */
@ -55,21 +55,21 @@ PrintVolumeHeader (LPTSTR pszRootPath)
if (szVolName[0] != '\0') if (szVolName[0] != '\0')
{ {
LoadString( GetModuleHandle(NULL), STRING_VOL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VOL_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, pszRootPath[0],szVolName); ConOutPrintf (szMsg, pszRootPath[0],szVolName);
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_VOL_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VOL_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, pszRootPath[0]); ConOutPrintf (szMsg, pszRootPath[0]);
} }
/* print the volume serial number */ /* print the volume serial number */
LoadString( GetModuleHandle(NULL), STRING_VOL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VOL_HELP3, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPrintf ((LPTSTR)szMsg, ConOutPrintf (szMsg,
HIWORD(dwSerialNr), HIWORD(dwSerialNr),
LOWORD(dwSerialNr)); LOWORD(dwSerialNr));
return 0; return 0;
@ -80,12 +80,12 @@ INT cmd_vol (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szRootPath[] = _T("A:\\"); TCHAR szRootPath[] = _T("A:\\");
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_VOL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_VOL_HELP4, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

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

@ -177,12 +177,12 @@ INT ServiceActivate (LPTSTR param, HWND hWnd)
INT CommandWindow (LPTSTR cmd, LPTSTR param) INT CommandWindow (LPTSTR cmd, LPTSTR param)
{ {
HWND h; HWND h;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -197,12 +197,12 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param)
{ {
LPTSTR str; LPTSTR str;
HWND h; HWND h;
WCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP2, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConOutPuts ((LPTSTR)szMsg); ConOutPuts (szMsg);
return 0; return 0;
} }
@ -222,8 +222,8 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param)
h=FindWindow(NULL, param); h=FindWindow(NULL, param);
if (!h) if (!h)
{ {
LoadString( GetModuleHandle(NULL), STRING_WINDOW_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_WINDOW_ERROR1, szMsg,sizeof(szMsg)/sizeof(TCHAR));
ConErrPuts ((LPTSTR)szMsg); ConErrPuts (szMsg);
return 1; return 1;
} }