Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the check for __REACTOS__. FormatMessage works better and is implemented in ros.

Browse source 
svn path=/trunk/; revision=18547
This commit is contained in:
Brandon Turner 2005-10-18 01:55:20 +00:00
parent 31154f2d58
commit 287174554b
1 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,9 +28,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
TCHAR szMessage[1024];
#ifndef __REACTOS__
LPTSTR szError;
#endif
va_list arg_ptr;
if (dwErrorCode == ERROR_SUCCESS)
@ -45,50 +43,21 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
va_end (arg_ptr);
}
#ifndef __REACTOS__
if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER,
NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR)&szError, 0, NULL))
{
ConErrPrintf (_T("%s %s\n"), szError, szMessage);
LocalFree (szError);
return;
}
else
{
LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConErrPrintf(szMsg, dwErrorCode);
if(szError)
LocalFree (szError);
return;
}
#else
switch (dwErrorCode)
{
case ERROR_FILE_NOT_FOUND:
LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
break;
case ERROR_PATH_NOT_FOUND:
LoadString(CMD_ModuleHandle, STRING_ERROR_PATH_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
break;
case ERROR_NOT_READY:
LoadString(CMD_ModuleHandle, STRING_ERROR_DRIVER_NOT_READY, szMsg, RC_STRING_MAX_SIZE);
break;
default:
LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE);
ConOutPrintf(szMsg);
return;
}
/* Fall back just in case the error is not defined */
if (szFormat)
ConOutPrintf (_T("%s -- %s\n"), szMsg, szMessage);
ConErrPrintf (_T("%s -- %s\n"), szMsg, szMessage);
else
ConOutPrintf (_T("%s\n"), szMsg);
#endif
ConErrPrintf (_T("%s\n"), szMsg);
}
VOID error_parameter_format(TCHAR ch)