diff --git a/pykd/vardata.cpp b/pykd/vardata.cpp index aac55f6..a4ee4c3 100644 --- a/pykd/vardata.cpp +++ b/pykd/vardata.cpp @@ -53,7 +53,7 @@ void VarDataMemory::read(PVOID buffer, ULONG length, ULONG offset /*= 0*/) const ULONG64 VarDataMemory::readPtr( ULONG ptrSize ) const { - return ptrSize == 4 ? ptrDWord( m_addr ) : ptrQWord( m_addr ); + return addr64( ptrSize == 4 ? ptrDWord( m_addr ) : ptrQWord( m_addr ) ); } ////////////////////////////////////////////////////////////////////////////// @@ -100,9 +100,9 @@ void VarDataConst::read(PVOID buffer, ULONG length, ULONG offset /*= 0*/) const ULONG64 VarDataConst::readPtr( ULONG ptrSize ) const { - return ptrSize == 4 ? + return addr64( ptrSize == 4 ? boost::apply_visitor( VariantToULong64(), m_value ) : - boost::apply_visitor( VariantToULong(), m_value ); + boost::apply_visitor( VariantToULong(), m_value ) ); } ////////////////////////////////////////////////////////////////////////////////// diff --git a/pykd/variant.h b/pykd/variant.h index 38e4824..a431c5c 100644 --- a/pykd/variant.h +++ b/pykd/variant.h @@ -21,7 +21,7 @@ public: template std::string operator()(T i ) const { std::stringstream sstr; - sstr << std::hex << i; + sstr << std::hex << "0x" << i; return sstr.str(); } };