zjgcjy/pykd
1
0
Fork 0
Code Actions Releases Wiki Activity

fixed comparing typeInfo with None

Browse Source
This commit is contained in:
ussrhero 2019-12-29 12:48:52 +03:00
parent a447202c6a
commit ad341bee9f
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pykd/pymod.cpp
View File

@ -1015,7 +1015,7 @@ void pykd_init()
.def( "__dir__", TypeInfoAdapter::getElementDir ) .def( "__dir__", TypeInfoAdapter::getElementDir )
.def("__contains__", TypeInfoAdapter::hasFieldOrMethod) .def("__contains__", TypeInfoAdapter::hasFieldOrMethod)
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
.def("__bool__", TypeInfoAdapter::isZero ) .def("__bool__", TypeInfoAdapter::isNotZero )
#else #else
.def("__iszero__", TypeInfoAdapter::isZero ) .def("__iszero__", TypeInfoAdapter::isZero )
#endif #endif

4
pykd/pytypeinfo.h
View File

@ -378,6 +378,10 @@ struct TypeInfoAdapter : public kdlib::TypeInfo {
return false; return false;
} }
static bool isNotZero(kdlib::TypeInfo &typeInfo) {
return true;
}
static bool hasFieldOrMethod(kdlib::TypeInfoPtr& typedVar, const std::wstring& name); static bool hasFieldOrMethod(kdlib::TypeInfoPtr& typedVar, const std::wstring& name);
}; };

8
test/scripts/typedvar.py
View File

@ -21,6 +21,14 @@ class TypedVarTest( unittest.TestCase ):
tv = pykd.typedVar( "g_structTest" ) tv = pykd.typedVar( "g_structTest" )
tv = pykd.typedVar( target.moduleName + "!g_structTest" ) tv = pykd.typedVar( target.moduleName + "!g_structTest" )
def testCompareWithNone(self):
tv = target.module.typedVar( "ucharVar" )
self.assertFalse(tv == None)
self.assertTrue(tv != None)
self.assertFalse(not tv)
self.assertTrue(tv)
def testBaseTypes(self): def testBaseTypes(self):
self.assertEqual( 10, target.module.typedVar( "ucharVar" ) ) self.assertEqual( 10, target.module.typedVar( "ucharVar" ) )
self.assertEqual( 1020, target.module.typedVar( "ushortVar" ) ) self.assertEqual( 1020, target.module.typedVar( "ushortVar" ) )

14
test/scripts/typeinfo.py
View File

@ -242,16 +242,12 @@ class TypeInfoTest( unittest.TestCase ):
ti = pykd.typeInfo("UInt8B").arrayOf(10) ti = pykd.typeInfo("UInt8B").arrayOf(10)
self.assertTrue( "UInt8B[10]", ti.name() ) self.assertTrue( "UInt8B[10]", ti.name() )
def testCompareWihNone(self): def testCompareWithNone(self):
ti = pykd.typeInfo("UInt8B") ti = pykd.typeInfo("UInt8B")
if ti == None: self.assertFalse(ti == None)
pass self.assertTrue(ti != None)
if ti != None: self.assertFalse(not ti)
pass self.assertTrue(ti)
if not ti:
pass
if ti:
pass
def testFunction(self): def testFunction(self):
functype = target.module.typedVar( "CdeclFuncPtr" ).type().deref() functype = target.module.typedVar( "CdeclFuncPtr" ).type().deref()