From 07f0d3a0fb6941d0368a631d30e7d63e36daea3b Mon Sep 17 00:00:00 2001 From: "SND\\kernelnet_cp" Date: Fri, 25 Nov 2011 12:19:24 +0000 Subject: [PATCH] [0.1.x] removed : findModule routine ( use overloaded loadModule routine ) git-svn-id: https://pykd.svn.codeplex.com/svn@71751 9b283d60-5439-405e-af05-b73fd8c4d996 --- pykd/dbgclient.h | 4 ++-- pykd/dbgext.cpp | 11 +++++------ pykd/module.cpp | 8 ++++---- pykd/module.h | 4 ++-- test/scripts/basetest.py | 4 ++-- test/scripts/moduletest.py | 26 +++++++++++++++++--------- test/scripts/pykdtest.py | 2 +- 7 files changed, 33 insertions(+), 26 deletions(-) diff --git a/pykd/dbgclient.h b/pykd/dbgclient.h index 15a4cd0..970389d 100644 --- a/pykd/dbgclient.h +++ b/pykd/dbgclient.h @@ -91,11 +91,11 @@ public: void loadDump( const std::wstring &fileName ); - Module loadModule( const std::string &moduleName ) { + Module loadModuleByName( const std::string &moduleName ) { return Module( m_client, moduleName ); } - Module findModule( ULONG64 offset ) { + Module loadModuleByOffset( ULONG64 offset ) { return Module( m_client, offset ); } diff --git a/pykd/dbgext.cpp b/pykd/dbgext.cpp index 9a073b6..2ac8f3b 100644 --- a/pykd/dbgext.cpp +++ b/pykd/dbgext.cpp @@ -199,11 +199,11 @@ BOOST_PYTHON_MODULE( pykd ) "Read an signed mashine's word wide integer from the target memory" ) .def( "ptrPtr", &DebugClient::ptrPtr, "Read an pointer value from the target memory" ) - .def ( "loadExt", &pykd::DebugClient::loadExtension, + .def( "loadExt", &pykd::DebugClient::loadExtension, "Load a debuger extension" ) - .def( "loadModule", &pykd::DebugClient::loadModule, + .def( "loadModule", &pykd::DebugClient::loadModuleByName, "Return instance of Module class" ) - .def( "findModule", &pykd::DebugClient::findModule, + .def( "loadModule", &pykd::DebugClient::loadModuleByOffset, "Return instance of the Module class which posseses specified address" ) .def( "dbgCommand", &pykd::DebugClient::dbgCommand, "Run a debugger's command and return it's result as a string" ) @@ -294,12 +294,11 @@ BOOST_PYTHON_MODULE( pykd ) "Read an signed mashine's word wide integer from the target memory" ); python::def( "ptrPtr", &ptrPtr, "Read an pointer value from the target memory" ); - python::def( "loadExt", &pykd::loadExtension, "Load a debuger extension" ); - python::def( "loadModule", &pykd::loadModule, + python::def( "loadModule", &loadModuleByName, "Return instance of Module class" ); - python::def( "findModule", &pykd::findModule, + python::def( "loadModule", &loadModuleByOffset, "Return instance of the Module class which posseses specified address" ); python::def( "dbgCommand", &pykd::dbgCommand, "Run a debugger's command and return it's result as a string" ), diff --git a/pykd/module.cpp b/pykd/module.cpp index 65fec4b..52733c9 100644 --- a/pykd/module.cpp +++ b/pykd/module.cpp @@ -8,14 +8,14 @@ namespace pykd { /////////////////////////////////////////////////////////////////////////////////// -Module loadModule( const std::string &moduleName ) { - return g_dbgClient->loadModule( moduleName ); +Module loadModuleByName( const std::string &moduleName ) { + return g_dbgClient->loadModuleByName( moduleName ); }; /////////////////////////////////////////////////////////////////////////////////// -Module findModule( ULONG64 offset ) { - return g_dbgClient->findModule( offset ); +Module loadModuleByOffset( ULONG64 offset ) { + return g_dbgClient->loadModuleByOffset( offset ); } /////////////////////////////////////////////////////////////////////////////////// diff --git a/pykd/module.h b/pykd/module.h index 414325b..50aa8c5 100644 --- a/pykd/module.h +++ b/pykd/module.h @@ -89,9 +89,9 @@ private: /////////////////////////////////////////////////////////////////////////////////// -Module loadModule( const std::string &moduleName ); +Module loadModuleByName( const std::string &moduleName ) ; -Module findModule( ULONG64 offset ); +Module loadModuleByOffset( ULONG64 offset ); /////////////////////////////////////////////////////////////////////////////////// diff --git a/test/scripts/basetest.py b/test/scripts/basetest.py index 05bf89c..f87e51a 100644 --- a/test/scripts/basetest.py +++ b/test/scripts/basetest.py @@ -26,7 +26,6 @@ class BaseTest( unittest.TestCase ): self.assertTrue( hasattr(pykd, 'delSynSymbol') ) self.assertTrue( hasattr(pykd, 'delSynSymbolsMask') ) self.assertTrue( hasattr(pykd, 'expr') ) - self.assertTrue( hasattr(pykd, 'findModule') ) self.assertTrue( hasattr(pykd, 'findSymbol') ) self.assertTrue( hasattr(pykd, 'getCurrentProcess') ) self.assertTrue( hasattr(pykd, 'getCurrentStack') ) @@ -107,7 +106,8 @@ class BaseTest( unittest.TestCase ): def testOldRemovedApi( self ): """ Branch test: old API 0.0.x what should be removed """ self.assertFalse( hasattr(pykd, 'dbgModuleClass') ) - self.assertFalse( hasattr(pykd, 'debugEvent') ) + self.assertFalse( hasattr(pykd, 'debugEvent') ) + self.assertFalse( hasattr(pykd, 'findModule') ) self.assertFalse( hasattr(pykd, 'windbgIn') ) self.assertFalse( hasattr(pykd, 'windbgOut') ) diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py index c87087c..e024f5d 100644 --- a/test/scripts/moduletest.py +++ b/test/scripts/moduletest.py @@ -33,18 +33,26 @@ class ModuleTest( unittest.TestCase ): def testFindModule( self ): - try: pykd.findModule( target.module.begin() - 0x10 ) - except pykd.BaseException: pass - #self.assertRaises( pykd.BaseException, pykd.findModule, target.module.begin() - 0x10 ) + try: + pykd.loadModule( target.module.begin() - 0x10 ) + self.assertTrue( False ) + except pykd.BaseException: + self.assertTrue( True ) - self.assertNotEqual( None, pykd.findModule( target.module.begin() ) ) - self.assertNotEqual( None, pykd.findModule( target.module.begin() + 0x10) ) + self.assertNotEqual( None, pykd.loadModule( target.module.begin() ) ) + self.assertNotEqual( None, pykd.loadModule( target.module.begin() + 0x10) ) - try: pykd.findModule( target.module.end() ) - except pykd.BaseException: pass + try: + pykd.loadModule( target.module.end() ) + self.assertTrue( False ) + except pykd.BaseException: + self.assertTrue( True ) - try: pykd.findModule( target.module.end() + 0x10) - except pykd.BaseException: pass + try: + pykd.loadModule( target.module.end() + 0x10 ) + self.assertTrue( False ) + except pykd.BaseException: + self.assertTrue( True ) def testSymbol( self ): self.assertEqual( target.module.rva("FuncWithName0"), target.module.offset("FuncWithName0") - target.module.begin() ) diff --git a/test/scripts/pykdtest.py b/test/scripts/pykdtest.py index 23536fb..884c424 100644 --- a/test/scripts/pykdtest.py +++ b/test/scripts/pykdtest.py @@ -58,4 +58,4 @@ if __name__ == "__main__": unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run( suite ) - #a = raw_input("\npress return\n") \ No newline at end of file + a = raw_input("\npress return\n") \ No newline at end of file