mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
[CONUTILS] Relax the enforcement of using FORMAT_MESSAGE_MAX_WIDTH_MASK in the ConMsg* and ConResMsg* functions.
This commit is contained in:
parent
a3403eff05
commit
075d58cc64
1 changed files with 20 additions and 35 deletions
|
@ -331,7 +331,7 @@ ConWrite(
|
||||||
|
|
||||||
|
|
||||||
#define CON_STREAM_WRITE_CALL(Stream, Str, Len) \
|
#define CON_STREAM_WRITE_CALL(Stream, Str, Len) \
|
||||||
(Stream)->WriteFunc((Stream), (Str), (Len));
|
(Stream)->WriteFunc((Stream), (Str), (Len))
|
||||||
|
|
||||||
/* Lock the stream only in non-USE_CRT mode (otherwise use the CRT stream lock) */
|
/* Lock the stream only in non-USE_CRT mode (otherwise use the CRT stream lock) */
|
||||||
#ifndef USE_CRT
|
#ifndef USE_CRT
|
||||||
|
@ -358,9 +358,7 @@ do { \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
#define CON_STREAM_WRITE(Stream, Str, Len) \
|
#define CON_STREAM_WRITE(Stream, Str, Len) \
|
||||||
do { \
|
CON_STREAM_WRITE_CALL((Stream), (Str), (Len))
|
||||||
CON_STREAM_WRITE_CALL((Stream), (Str), (Len)); \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -797,8 +795,8 @@ ConResPrintf(
|
||||||
* The formatting options, and how to interpret the @p lpSource parameter.
|
* The formatting options, and how to interpret the @p lpSource parameter.
|
||||||
* See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER
|
* See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER
|
||||||
* and @b FORMAT_MESSAGE_ARGUMENT_ARRAY flags are always ignored.
|
* and @b FORMAT_MESSAGE_ARGUMENT_ARRAY flags are always ignored.
|
||||||
* The function implicitly uses the @b FORMAT_MESSAGE_IGNORE_INSERTS and
|
* The function implicitly uses the @b FORMAT_MESSAGE_IGNORE_INSERTS flag
|
||||||
* @b FORMAT_MESSAGE_MAX_WIDTH_MASK flags to implement its behaviour.
|
* to implement its behaviour.
|
||||||
*
|
*
|
||||||
* @param[in] lpSource
|
* @param[in] lpSource
|
||||||
* The location of the message definition. The type of this parameter
|
* The location of the message definition. The type of this parameter
|
||||||
|
@ -841,8 +839,6 @@ ConMsgPuts(
|
||||||
dwFlags |= FORMAT_MESSAGE_IGNORE_INSERTS; // Ignore inserts for FormatMessage.
|
dwFlags |= FORMAT_MESSAGE_IGNORE_INSERTS; // Ignore inserts for FormatMessage.
|
||||||
dwFlags &= ~FORMAT_MESSAGE_ARGUMENT_ARRAY;
|
dwFlags &= ~FORMAT_MESSAGE_ARGUMENT_ARRAY;
|
||||||
|
|
||||||
dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Retrieve the message string without appending extra newlines.
|
* Retrieve the message string without appending extra newlines.
|
||||||
* Wrap in SEH to protect from invalid string parameters.
|
* Wrap in SEH to protect from invalid string parameters.
|
||||||
|
@ -916,8 +912,6 @@ ConMsgPrintf2V(
|
||||||
dwFlags |= FORMAT_MESSAGE_IGNORE_INSERTS; // Ignore inserts for FormatMessage.
|
dwFlags |= FORMAT_MESSAGE_IGNORE_INSERTS; // Ignore inserts for FormatMessage.
|
||||||
dwFlags &= ~FORMAT_MESSAGE_ARGUMENT_ARRAY;
|
dwFlags &= ~FORMAT_MESSAGE_ARGUMENT_ARRAY;
|
||||||
|
|
||||||
dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Retrieve the message string without appending extra newlines.
|
* Retrieve the message string without appending extra newlines.
|
||||||
* Wrap in SEH to protect from invalid string parameters.
|
* Wrap in SEH to protect from invalid string parameters.
|
||||||
|
@ -976,9 +970,8 @@ ConMsgPrintf2V(
|
||||||
*
|
*
|
||||||
* @param[in] dwFlags
|
* @param[in] dwFlags
|
||||||
* The formatting options, and how to interpret the @p lpSource parameter.
|
* The formatting options, and how to interpret the @p lpSource parameter.
|
||||||
* See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER
|
* See FormatMessage() for more details.
|
||||||
* flags is always ignored. The function implicitly uses the
|
* The @b FORMAT_MESSAGE_ALLOCATE_BUFFER flag is always ignored.
|
||||||
* @b FORMAT_MESSAGE_MAX_WIDTH_MASK flag to implement its behaviour.
|
|
||||||
*
|
*
|
||||||
* @param[in] lpSource
|
* @param[in] lpSource
|
||||||
* The location of the message definition. The type of this parameter
|
* The location of the message definition. The type of this parameter
|
||||||
|
@ -1034,10 +1027,6 @@ ConMsgPrintfV(
|
||||||
|
|
||||||
/* Sanitize dwFlags */
|
/* Sanitize dwFlags */
|
||||||
dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer.
|
dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer.
|
||||||
//
|
|
||||||
// NOTE: Technique taken from eventvwr.c!GetMessageStringFromDll()
|
|
||||||
//
|
|
||||||
dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Retrieve the message string without appending extra newlines.
|
* Retrieve the message string without appending extra newlines.
|
||||||
|
@ -1091,8 +1080,6 @@ ConMsgPrintfV(
|
||||||
* The formatting options, and how to interpret the @p lpSource parameter.
|
* The formatting options, and how to interpret the @p lpSource parameter.
|
||||||
* See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER
|
* See FormatMessage() for more details. The @b FORMAT_MESSAGE_ALLOCATE_BUFFER
|
||||||
* and @b FORMAT_MESSAGE_ARGUMENT_ARRAY flags are always ignored.
|
* and @b FORMAT_MESSAGE_ARGUMENT_ARRAY flags are always ignored.
|
||||||
* The function implicitly uses the @b FORMAT_MESSAGE_MAX_WIDTH_MASK flag
|
|
||||||
* to implement its behaviour.
|
|
||||||
*
|
*
|
||||||
* @param[in] lpSource
|
* @param[in] lpSource
|
||||||
* The location of the message definition. The type of this parameter
|
* The location of the message definition. The type of this parameter
|
||||||
|
@ -1170,9 +1157,10 @@ ConMsgPrintf(
|
||||||
*
|
*
|
||||||
* @param[in] dwFlags
|
* @param[in] dwFlags
|
||||||
* The formatting options, see FormatMessage() for more details.
|
* The formatting options, see FormatMessage() for more details.
|
||||||
* The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY and
|
* The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
||||||
* @b FORMAT_MESSAGE_IGNORE_INSERTS. All the other flags are internally
|
* @b FORMAT_MESSAGE_IGNORE_INSERTS and @b FORMAT_MESSAGE_MAX_WIDTH_MASK.
|
||||||
* overridden by the function to implement its behaviour.
|
* All the other flags are internally overridden by the function
|
||||||
|
* to implement its behaviour.
|
||||||
*
|
*
|
||||||
* @param[in] uID
|
* @param[in] uID
|
||||||
* The identifier of the message string. The format string follows the
|
* The identifier of the message string. The format string follows the
|
||||||
|
@ -1234,10 +1222,6 @@ ConResMsgPrintfExV(
|
||||||
|
|
||||||
/* Sanitize dwFlags */
|
/* Sanitize dwFlags */
|
||||||
dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer.
|
dwFlags |= FORMAT_MESSAGE_ALLOCATE_BUFFER; // Always allocate an internal buffer.
|
||||||
//
|
|
||||||
// NOTE: Technique taken from eventvwr.c!GetMessageStringFromDll()
|
|
||||||
//
|
|
||||||
dwFlags |= FORMAT_MESSAGE_MAX_WIDTH_MASK;
|
|
||||||
|
|
||||||
/* The string has already been manually loaded */
|
/* The string has already been manually loaded */
|
||||||
dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM);
|
dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM);
|
||||||
|
@ -1291,9 +1275,10 @@ ConResMsgPrintfExV(
|
||||||
*
|
*
|
||||||
* @param[in] dwFlags
|
* @param[in] dwFlags
|
||||||
* The formatting options, see FormatMessage() for more details.
|
* The formatting options, see FormatMessage() for more details.
|
||||||
* The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY and
|
* The only valid flags are @b FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
||||||
* @b FORMAT_MESSAGE_IGNORE_INSERTS. All the other flags are internally
|
* @b FORMAT_MESSAGE_IGNORE_INSERTS and @b FORMAT_MESSAGE_MAX_WIDTH_MASK.
|
||||||
* overridden by the function to implement its behaviour.
|
* All the other flags are internally overridden by the function
|
||||||
|
* to implement its behaviour.
|
||||||
*
|
*
|
||||||
* @param[in] uID
|
* @param[in] uID
|
||||||
* The identifier of the message string. The format string follows the
|
* The identifier of the message string. The format string follows the
|
||||||
|
@ -1357,9 +1342,9 @@ ConResMsgPrintfV(
|
||||||
*
|
*
|
||||||
* @param[in] dwFlags
|
* @param[in] dwFlags
|
||||||
* The formatting options, see FormatMessage() for more details.
|
* The formatting options, see FormatMessage() for more details.
|
||||||
* The only valid flag is @b FORMAT_MESSAGE_IGNORE_INSERTS.
|
* The only valid flags are @b FORMAT_MESSAGE_IGNORE_INSERTS and
|
||||||
* All the other flags are internally overridden by the function
|
* @b FORMAT_MESSAGE_MAX_WIDTH_MASK. All the other flags are internally
|
||||||
* to implement its behaviour.
|
* overridden by the function to implement its behaviour.
|
||||||
*
|
*
|
||||||
* @param[in] uID
|
* @param[in] uID
|
||||||
* The identifier of the message string. The format string follows the
|
* The identifier of the message string. The format string follows the
|
||||||
|
@ -1431,9 +1416,9 @@ ConResMsgPrintfEx(
|
||||||
*
|
*
|
||||||
* @param[in] dwFlags
|
* @param[in] dwFlags
|
||||||
* The formatting options, see FormatMessage() for more details.
|
* The formatting options, see FormatMessage() for more details.
|
||||||
* The only valid flag is @b FORMAT_MESSAGE_IGNORE_INSERTS.
|
* The only valid flags are @b FORMAT_MESSAGE_IGNORE_INSERTS and
|
||||||
* All the other flags are internally overridden by the function
|
* @b FORMAT_MESSAGE_MAX_WIDTH_MASK. All the other flags are internally
|
||||||
* to implement its behaviour.
|
* overridden by the function to implement its behaviour.
|
||||||
*
|
*
|
||||||
* @param[in] uID
|
* @param[in] uID
|
||||||
* The identifier of the message string. The format string follows the
|
* The identifier of the message string. The format string follows the
|
||||||
|
|
Loading…
Reference in a new issue