Commit e22b4cd3 authored by ussrhero's avatar ussrhero
Browse files

updated kdlibcpp version to 1.2.11

parent a99b758d
...@@ -450,14 +450,24 @@ struct SymbolEnumeratorAdapter ...@@ -450,14 +450,24 @@ struct SymbolEnumeratorAdapter
return obj; return obj;
} }
std::wstring next() python::tuple next()
{ {
auto symName = m_symEnum->Next(); std::wstring name;
kdlib::MEMOFFSET_64 offset;
kdlib::TypeInfoPtr typeInfo;
if (symName.empty()) {
throw StopIteration("No more data."); AutoRestorePyState pystate;
if (!m_symEnum->Next())
throw StopIteration("No more data.");
name = m_symEnum->getName();
offset = m_symEnum->getOffset();
typeInfo = m_symEnum->getType();
}
return symName; return python::make_tuple(name, offset, typeInfo);
} }
private: private:
......
...@@ -387,9 +387,9 @@ class TypeInfoTest( unittest.TestCase ): ...@@ -387,9 +387,9 @@ class TypeInfoTest( unittest.TestCase ):
self.assertTrue(ti.isStaticField("m_staticConst")) self.assertTrue(ti.isStaticField("m_staticConst"))
self.assertFalse(ti.isConstField("m_staticConst")) self.assertFalse(ti.isConstField("m_staticConst"))
def testClangCompile(self): #def testClangCompile(self):
src = "#include <windows.h>\r\n"; # src = "#include <windows.h>\r\n";
opt = "-I\"C:/Program Files (x86)/Windows Kits/8.1/Include/um\" -I\"C:/Program Files (x86)/Windows Kits/8.1/Include/shared\" -w"; # opt = "-I\"C:/Program Files (x86)/Windows Kits/8.1/Include/um\" -I\"C:/Program Files (x86)/Windows Kits/8.1/Include/shared\" -w";
symEnum = pykd.getSymbolProviderFromSource(src, opt) # symEnum = pykd.getSymbolProviderFromSource(src, opt)
for sym in symEnum: # for sym, _, _ in symEnum:
print(sym) # print(sym)
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment