diff --git a/pykd/dbgexcept.h b/pykd/dbgexcept.h index ed69942..9948597 100644 --- a/pykd/dbgexcept.h +++ b/pykd/dbgexcept.h @@ -119,6 +119,8 @@ inline void registerExceptions() pykd::exception( "MemoryException", "Target memory access exception class" ); pykd::exception( "SymbolException", "Symbol exception" ); pykd::exception( "TypeException", "type exception" ); + pykd::exception( "CallException", "Function call exception"); + pykd::exception( "CPUException", "CPU exception"); python::register_exception_translator( &dbgExceptionTranslate ); python::register_exception_translator( &pykdExceptionTranslate ); diff --git a/pykd/pykdver.h b/pykd/pykdver.h index 6c2c9e0..cf9b2bc 100644 --- a/pykd/pykdver.h +++ b/pykd/pykdver.h @@ -2,7 +2,7 @@ #define PYKD_VERSION_MAJOR 0 #define PYKD_VERSION_MINOR 3 #define PYKD_VERSION_SUBVERSION 1 -#define PYKD_VERSION_BUILDNO 9 +#define PYKD_VERSION_BUILDNO 10 #define __VER_STR2__(x) #x #define __VER_STR1__(x) __VER_STR2__(x) diff --git a/samples/um/stdstring.py b/samples/um/stdstring.py index 068192a..318d946 100644 --- a/samples/um/stdstring.py +++ b/samples/um/stdstring.py @@ -27,11 +27,11 @@ param = pykd.stackAlloc(100) pykd.writeCStr(param, "hello") -# call ctor for initalizing. std::string has some form of constructor so we need note prototype +# call ctor for initalizing. std::string has several forms of constructor so we need to note prototype ctor = stringVar.method( stringClassName, "Void(__thiscall)(Char*)" ) ctor(param) #check result: -print( pykd.loadCStr( stringVar.c_str() ) ) +print( pykd.loadCStr( stringVar.c_str() ) ) pykd.stackFree(100) diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py index f8ce2ab..a76c6c3 100644 --- a/test/scripts/moduletest.py +++ b/test/scripts/moduletest.py @@ -86,7 +86,7 @@ class ModuleTest( unittest.TestCase ): fileName = pykd.getSourceFile(target.module.CdeclFunc ) self.assertTrue( re.search('testfunc\\.cpp', fileName ) ) fileName, lineNo, displacement = pykd.getSourceLine( target.module.CdeclFunc + 2) - self.assertEqual( 27, lineNo ) + self.assertEqual( 30, lineNo ) self.assertTrue( re.search('testfunc\\.cpp', fileName ) ) self.assertEqual( 2, displacement ) #fileName, lineNo, displacement = pykd.getSourceLine()