diff --git a/pykd/pymod.cpp b/pykd/pymod.cpp index 11f038f..2f45a39 100644 --- a/pykd/pymod.cpp +++ b/pykd/pymod.cpp @@ -223,7 +223,7 @@ BOOST_PYTHON_MODULE( pykd ) "Return string represention of windows ANSI_STRING type" ) .def( "loadPtrList", &DebugClient::loadPtrList, "Return list of pointers, each points to next" ) - .def( "loadPtrArray", &DebugClient::loadPtrArray, + .def( "loadPtrs", &DebugClient::loadPtrArray, "Read the block of the target's memory and return it as a list of pointers" ) .def( "ptrByte", &DebugClient::ptrByte, "Read an unsigned 1-byte integer from the target memory" ) @@ -418,7 +418,7 @@ BOOST_PYTHON_MODULE( pykd ) "Return string represention of windows ANSU_STRING type" ); python::def( "loadPtrList", &loadPtrList, "Return list of pointers, each points to next" ); - python::def( "loadPtrArray", &loadPtrArray, + python::def( "loadPtrs", &loadPtrArray, "Read the block of the target's memory and return it as a list of pointers" ); python::def( "ptrByte", &ptrByte, "Read an unsigned 1-byte integer from the target memory" ); diff --git a/test/scripts/basetest.py b/test/scripts/basetest.py index 297f2bb..502fbd5 100644 --- a/test/scripts/basetest.py +++ b/test/scripts/basetest.py @@ -49,6 +49,7 @@ class BaseTest( unittest.TestCase ): self.assertTrue( hasattr(pykd, 'loadDump') ) self.assertTrue( hasattr(pykd, 'loadModule') ) self.assertTrue( hasattr(pykd, 'loadQWords') ) + self.assertTrue( hasattr(pykd, 'loadPtrs') ) self.assertTrue( hasattr(pykd, 'loadSignBytes') ) self.assertTrue( hasattr(pykd, 'loadSignDWords') ) self.assertTrue( hasattr(pykd, 'loadSignQWords') ) @@ -103,7 +104,6 @@ class BaseTest( unittest.TestCase ): self.assertFalse( hasattr(pykd, 'debugEvent') ) self.assertFalse( hasattr(pykd, 'findModule') ) self.assertFalse( hasattr(pykd, 'loadLinkedList') ) - self.assertFalse( hasattr(pykd, 'loadPtrs') ) self.assertFalse( hasattr(pykd, 'reloadModule') ) self.assertFalse( hasattr(pykd, 'sizeof') ) self.assertFalse( hasattr(pykd, 'windbgIn') ) @@ -121,7 +121,6 @@ class BaseTest( unittest.TestCase ): self.assertTrue( hasattr(pykd, 'killProcess') ) self.assertTrue( hasattr(pykd, 'loadExt') ) self.assertTrue( hasattr(pykd, 'loadPtrList') ) - self.assertTrue( hasattr(pykd, 'loadPtrArray') ) self.assertTrue( hasattr(pykd, 'setExecutionStatus') ) self.assertTrue( hasattr(pykd, 'waitForEvent') ) diff --git a/test/scripts/memtest.py b/test/scripts/memtest.py index 23f2203..b83a508 100644 --- a/test/scripts/memtest.py +++ b/test/scripts/memtest.py @@ -92,7 +92,7 @@ class MemoryTest( unittest.TestCase ): self.assertEqual( 3, len( lst ) ) def testPtrArray( self ): - lst = pykd.loadPtrArray( target.module.arrIntMatrixPtrs, 3 ) + lst = pykd.loadPtrs( target.module.arrIntMatrixPtrs, 3 ) self.assertEqual( 3, len( lst ) ) def testInvalidAddr( self ):