x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: changed stringformat for the log command (you now write {d:0} instead of {d0})

This commit is contained in:
mrexodia 2016-05-22 14:52:31 +02:00
parent 637aa0f1b9
commit c4777b2984
1 changed files with 37 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/dbg/stringformat.cpp
View File

@ -53,32 +53,45 @@ static String printValue(FormatValueType value, ValueType::ValueType type)
return result;
}
static const char* getArgExpressionType(const String & formatString, ValueType::ValueType & type)
{
auto hasExplicitType = false;
type = ValueType::Hex;
if(formatString.size() > 2 && formatString[1] == ':')
{
switch(formatString[0])
{
case 'd':
type = ValueType::SignedDecimal;
hasExplicitType = true;
break;
case 'u':
type = ValueType::UnsignedDecimal;
hasExplicitType = true;
break;
case 'p':
type = ValueType::Pointer;
hasExplicitType = true;
break;
case 's':
type = ValueType::String;
hasExplicitType = true;
break;
default:
break;
}
}
auto expression = formatString.c_str();
if(hasExplicitType)
expression += 2;
return expression;
}
static unsigned int getArgNumType(const String & formatString, ValueType::ValueType & type)
{
int add = 0;
switch(formatString[0])
{
case 'd':
type = ValueType::SignedDecimal;
add++;
break;
case 'u':
type = ValueType::UnsignedDecimal;
add++;
break;
case 'p':
type = ValueType::Pointer;
add++;
break;
case 's':
type = ValueType::String;
add++;
break;
default:
type = ValueType::Hex;
}
auto expression = getArgExpressionType(formatString, type);
unsigned int argnum = 0;
if(sscanf(formatString.c_str() + add, "%u", &argnum) != 1)
if(!expression || sscanf(expression, "%u", &argnum) != 1)
type = ValueType::Unknown;
return argnum;
}
@ -139,45 +152,10 @@ String stringformat(String format, const FormatValueVector & values)
return output;
}
static const char* getArgValueTypeInline(const String & formatString, ValueType::ValueType & type)
{
auto hasExplicitType = false;
if(formatString.size() > 2 && formatString[1] == ':')
{
switch(formatString[0])
{
case 'd':
type = ValueType::SignedDecimal;
hasExplicitType = true;
break;
case 'u':
type = ValueType::UnsignedDecimal;
hasExplicitType = true;
break;
case 'p':
type = ValueType::Pointer;
hasExplicitType = true;
break;
case 's':
type = ValueType::String;
hasExplicitType = true;
break;
default:
break;
}
}
auto expression = formatString.c_str();
if(hasExplicitType)
expression += 2;
else
type = ValueType::Hex;
return expression;
}
static String handleFormatStringInline(const String & formatString)
{
auto type = ValueType::Unknown;
auto value = getArgValueTypeInline(formatString, type);
auto value = getArgExpressionType(formatString, type);
if(value && *value)
return printValue(value, type);
return "[Formatting Error]";