reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-03 00:57:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Made call to FormatMessage more robust.

Browse Source
This commit is contained in:
Brad King 2003-07-07 09:38:14 -04:00
parent 7479303e01
commit 78edd51671
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/kwsys/ProcessWin32.c
View File

@ -1237,9 +1237,42 @@ void kwsysProcessCleanup(kwsysProcess* cp, int error)
/* If this is an error case, report the error. */
if(error)
{
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
0, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
cp->ErrorMessage, CMPE_PIPE_BUFFER_SIZE, 0);
/* Format the error message. */
DWORD original = GetLastError();
DWORD length = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, 0, original,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
cp->ErrorMessage, CMPE_PIPE_BUFFER_SIZE, 0);
if(length > 0)
{
/* Remove trailing period and newline, if any. */
if(cp->ErrorMessage[length-1] == '\n')
{
cp->ErrorMessage[length-1] = 0;
--length;
if(length > 0 && cp->ErrorMessage[length-1] == '\r')
{
cp->ErrorMessage[length-1] = 0;
--length;
}
}
if(cp->ErrorMessage[length-1] == '.')
{
cp->ErrorMessage[length-1] = 0;
--length;
}
}
else
{
/* FormatMessage failed. Use a default message. */
_snprintf(cp->ErrorMessage, CMPE_PIPE_BUFFER_SIZE,
"Process execution failed with error 0x%X. "
"FormatMessage failed with error 0x%X.",
original, GetLastError());
}
/* Set the error state. */
cp->State = kwsysProcess_State_Error;
}