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

DBG: changed pointer format string + removed LongHex format string

This commit is contained in:
mrexodia 2016-05-25 04:57:30 +02:00
parent 35514bdf5e
commit 321dae7910
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dbg/stringformat.cpp
View File

@ -10,7 +10,6 @@ namespace ValueType
SignedDecimal,
UnsignedDecimal,
Hex,
LongHex,
Pointer,
String
};
@ -37,13 +36,9 @@ static String printValue(FormatValueType value, ValueType::ValueType type)
if(validval)
sprintf_s(result, "%" fext "X", valuint);
break;
case ValueType::LongHex:
if(validval)
sprintf_s(result, fhex, valuint);
break;
case ValueType::Pointer:
if(validval)
sprintf_s(result, "0x" fhex, valuint);
sprintf_s(result, fhex, valuint);
break;
case ValueType::String:
if(validval)
@ -64,7 +59,6 @@ static const char* getArgExpressionType(const String & formatString, ValueType::
type = ValueType::Hex;
if(formatString.size() > 2 && formatString[1] == ':')
{
hasExplicitType = true;
switch(formatString[0])
{
case 'd':
@ -80,16 +74,18 @@ static const char* getArgExpressionType(const String & formatString, ValueType::
type = ValueType::String;
break;
case 'x':
type = ValueType::LongHex;
break;
default:
hasExplicitType = false;
type = ValueType::Hex;
break;
default: //invalid format
return nullptr;
}
hasExplicitType = true;
}
auto expression = formatString.c_str();
if(hasExplicitType)
expression += 2;
else
type = ValueType::Hex;
return expression;
}
@ -104,9 +100,9 @@ static unsigned int getArgNumType(const String & formatString, ValueType::ValueT
static String handleFormatString(const String & formatString, const FormatValueVector & values)
{
ValueType::ValueType type = ValueType::Unknown;
unsigned int argnum = getArgNumType(formatString, type);
if(argnum < values.size())
auto type = ValueType::Unknown;
auto argnum = getArgNumType(formatString, type);
if(type != ValueType::Unknown && argnum < values.size())
return printValue(values.at(argnum), type);
return "[Formatting Error]";
}