Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 08:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] Convert to explicitly unicode

Browse source
This commit is contained in:
Timo Kreuzer 2024-05-18 14:56:29 +03:00
parent cca9acfa1d
commit c948ea859b
2 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
base/shell/cmd/error.c
View file

@ -25,11 +25,11 @@
VOID
ErrorMessage(
IN DWORD dwErrorCode,
IN PCTSTR szFormat OPTIONAL,
IN PCWSTR szFormat OPTIONAL,
...)
{
va_list arg_ptr;
PTSTR szError;
PWSTR szError;
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szMessage[1024];
@ -40,7 +40,7 @@ ErrorMessage(
if (szFormat)
{
va_start(arg_ptr, szFormat);
_vstprintf(szMessage, szFormat, arg_ptr);
vswprintf(szMessage, szFormat, arg_ptr);
va_end(arg_ptr);
}
@ -62,21 +62,21 @@ ErrorMessage(
ConErrPrintf(_T("%s\n"), szMsg);
}
VOID error_parameter_format(TCHAR ch)
VOID error_parameter_format(WCHAR ch)
{
ConErrResPrintf(STRING_ERROR_PARAMETERF_ERROR, ch);
nErrorLevel = 1;
}
VOID error_invalid_switch(TCHAR ch)
VOID error_invalid_switch(WCHAR ch)
{
ConErrResPrintf(STRING_ERROR_INVALID_SWITCH, ch);
nErrorLevel = 1;
}
VOID error_too_many_parameters(PCTSTR s)
VOID error_too_many_parameters(PCWSTR s)
{
ConErrResPrintf(STRING_ERROR_TOO_MANY_PARAMETERS, s);
nErrorLevel = 1;
@ -97,7 +97,7 @@ VOID error_file_not_found(VOID)
}
VOID error_sfile_not_found(PCTSTR s)
VOID error_sfile_not_found(PCWSTR s)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
@ -121,7 +121,7 @@ VOID error_invalid_drive(VOID)
}
VOID error_bad_command(PCTSTR s)
VOID error_bad_command(PCWSTR s)
{
ConErrResPrintf(STRING_ERROR_BADCOMMAND, s);
nErrorLevel = 9009;
@ -142,16 +142,16 @@ VOID error_out_of_memory(VOID)
}
VOID error_invalid_parameter_format(PCTSTR s)
VOID error_invalid_parameter_format(PCWSTR s)
{
ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, s);
nErrorLevel = 1;
}
VOID error_syntax(PCTSTR s)
VOID error_syntax(PCWSTR s)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, ARRAYSIZE(szMsg));