eersoy93/exectos
1
0
Fork 0
forked from xt-sys/exectos
Code Pull Requests Activity

Add %Z MSVC extension for ANSI/Unicode string argument support

Browse Source
This commit is contained in:
Rafal Kupiec 2024-02-16 18:14:16 +01:00
parent a1ec5e410d
commit edd18b1dea
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
xtoskrnl/rtl/widestr.c
View File

@ -512,7 +512,9 @@ RtlpFormatWideStringArgumentSpecifier(IN PRTL_PRINT_CONTEXT Context,
IN OUT PULONG Index) IN OUT PULONG Index)
{ {
RTL_PRINT_FORMAT_PROPERTIES FormatProperties; RTL_PRINT_FORMAT_PROPERTIES FormatProperties;
PUNICODE_STRING UnicodeStrArg;
WCHAR Specifier, WideCharArg; WCHAR Specifier, WideCharArg;
PANSI_STRING AnsiStrArg;
LONGLONG SpecifierValue; LONGLONG SpecifierValue;
VA_LIST ArgumentsCopy; VA_LIST ArgumentsCopy;
LARGE_DOUBLE FloatArg; LARGE_DOUBLE FloatArg;
@ -885,6 +887,10 @@ RtlpFormatWideStringArgumentSpecifier(IN PRTL_PRINT_CONTEXT Context,
FormatProperties.Radix = 16; FormatProperties.Radix = 16;
FormatProperties.PrintUpperCase = TRUE; FormatProperties.PrintUpperCase = TRUE;
break; break;
case L'Z':
/* MSVC extension: ANSI/Unicode string argument */
FormatProperties.VariableType = FormatProperties.LongInteger ? UnicodeString : AnsiString;
break;
case L'%': case L'%':
/* Print '%' character */ /* Print '%' character */
FormatProperties.VariableType = Unknown; FormatProperties.VariableType = Unknown;
@ -1091,6 +1097,42 @@ RtlpFormatWideStringArgumentSpecifier(IN PRTL_PRINT_CONTEXT Context,
/* Write formatted wide string value */ /* Write formatted wide string value */
Status = RtlpWriteWideStringValue(Context, &FormatProperties, WideStrArg, RtlWideStringLength(WideStrArg, 0)); Status = RtlpWriteWideStringValue(Context, &FormatProperties, WideStrArg, RtlWideStringLength(WideStrArg, 0));
} }
else if(FormatProperties.VariableType == AnsiString )
{
/* ANSI string type */
if(ArgPosition != 0)
{
/* Get argument value from specified argument position */
IntArg = RtlpGetWideStringArgument(&ArgumentsCopy, ArgPosition, sizeof(PANSI_STRING));
AnsiStrArg = (PANSI_STRING)(UINT_PTR)IntArg;
}
else
{
/* Get argument value from the next argument */
AnsiStrArg = VA_ARG(*ArgumentList, PANSI_STRING);
}
/* Write formatted ANSI string value */
Status = RtlpWriteWideStringStringValue(Context, &FormatProperties, AnsiStrArg->Buffer, AnsiStrArg->Length);
}
else if(FormatProperties.VariableType == UnicodeString)
{
/* Unicode string type */
if(ArgPosition != 0)
{
/* Get argument value from specified argument position */
IntArg = RtlpGetWideStringArgument(&ArgumentsCopy, ArgPosition, sizeof(PUNICODE_STRING));
UnicodeStrArg = (PUNICODE_STRING)(UINT_PTR)IntArg;
}
else
{
/* Get argument value from the next argument */
UnicodeStrArg = VA_ARG(*ArgumentList, PUNICODE_STRING);
}
/* Write formatted UNICODE string value */
Status = RtlpWriteWideStringValue(Context, &FormatProperties, UnicodeStrArg->Buffer, UnicodeStrArg->Length);
}
/* Cleanup ArgumentsCopy object */ /* Cleanup ArgumentsCopy object */
VA_END(ArgumentsCopy); VA_END(ArgumentsCopy);