diff --git a/pykd/diawrapper.cpp b/pykd/diawrapper.cpp index 1e7c780..1081aa4 100644 --- a/pykd/diawrapper.cpp +++ b/pykd/diawrapper.cpp @@ -15,7 +15,7 @@ const std::string Exception::descPrefix("pyDia: "); //////////////////////////////////////////////////////////////////////////////// #define callSymbol(method) \ - callSymbolT( &IDiaSymbol::##method, __FUNCTION__, #method) + callSymbolT( &IDiaSymbol::##method, #method) //////////////////////////////////////////////////////////////////////////////// diff --git a/pykd/diawrapper.h b/pykd/diawrapper.h index d4f2375..91e6aeb 100644 --- a/pykd/diawrapper.h +++ b/pykd/diawrapper.h @@ -186,7 +186,6 @@ protected: template TRet callSymbolT( HRESULT(STDMETHODCALLTYPE IDiaSymbol::*method)(TRet *), - const char *funcName, const char *methodName ) { diff --git a/pykd/utils.h b/pykd/utils.h index 79e75d0..1f2dbdd 100644 --- a/pykd/utils.h +++ b/pykd/utils.h @@ -12,7 +12,13 @@ public: toWStr(const std::string &sz) { m_buf.resize( sz.size() + 1, L'\0' ); - ::MultiByteToWideChar( CP_ACP, 0, sz.c_str(), sz.size(), &m_buf[0], m_buf.size() ); + ::MultiByteToWideChar( + CP_ACP, + 0, + sz.c_str(), + static_cast( sz.size() ), + &m_buf[0], + static_cast( m_buf.size() ) ); } operator const WCHAR *() const { @@ -70,7 +76,7 @@ public: bstr, chars, &ret[0], - ret.size(), + static_cast(ret.size()), NULL, NULL); return ret; diff --git a/test/targetapp/targetapp.cpp b/test/targetapp/targetapp.cpp index bede5f3..e7ec9eb 100644 --- a/test/targetapp/targetapp.cpp +++ b/test/targetapp/targetapp.cpp @@ -65,16 +65,28 @@ void FuncWithName0() _classChild.baseMethod(); reinterpret_cast(&_classChild)->virtFunc2(); + std::cout << _classChild.m_childField2; + std::cout << g_constNumValue; + std::cout << g_constBoolValue; + std::cout << g_ucharValue; + std::cout << g_ushortValue; + std::cout << g_ulongValue; + std::cout << g_ulonglongValue; } void FuncWithName1(int a) { - unionTest _unionTest[2]; + unionTest _unionTest[2] = {0}; _unionTest[1].m_value = 0; structTest _structTest; _structTest.m_field1 = a; struct2 _struct2; RtlZeroMemory(&_struct2, sizeof(_struct2)); + + std::cout << _unionTest[0].m_value; + std::cout << _structTest.m_field1; + std::cout << _struct2.m_struct.m_field1; + std::cout << g_string; } int _tmain(int argc, _TCHAR* argv[])