Commit 46382d24 authored by ussrhero's avatar ussrhero

Merge branch '0.3.4.13' into 0.3.2

parents c36dafa3 7bc86e0c
Subproject commit 5be28cda0ef7473125813c250adceef4d07218a4
Subproject commit d6c85ac71663a98e885aed81ced4ca1aadd0be8e
......@@ -104,13 +104,13 @@ bool isKernelDebugging()
inline
python::object debugCommand( const std::wstring &command, bool suppressOutput = true)
python::object debugCommand( const std::wstring &command, bool suppressOutput = true, const kdlib::OutputFlagsSet& captureFlags = kdlib::OutputFlag::Normal)
{
std::wstring debugResult;
{
AutoRestorePyState pystate;
debugResult = kdlib::debugCommand(command, suppressOutput);
debugResult = kdlib::debugCommand(command, suppressOutput, captureFlags);
}
if (debugResult.size() > 0 )
......
......@@ -2,7 +2,7 @@
#define PYKD_VERSION_MAJOR 0
#define PYKD_VERSION_MINOR 3
#define PYKD_VERSION_SUBVERSION 4
#define PYKD_VERSION_BUILDNO 12
#define PYKD_VERSION_BUILDNO 13
#define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x)
......
......@@ -42,7 +42,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( terminateProcess_, pykd::terminateProcess, 0,
BOOST_PYTHON_FUNCTION_OVERLOADS(closeDump_, pykd::closeDump, 0, 1);
BOOST_PYTHON_FUNCTION_OVERLOADS( attachKernel_, pykd::attachKernel, 0, 1 );
BOOST_PYTHON_FUNCTION_OVERLOADS( evaluate_, pykd::evaluate, 1, 2 );
BOOST_PYTHON_FUNCTION_OVERLOADS( debugCommand_, pykd::debugCommand, 1, 2 );
BOOST_PYTHON_FUNCTION_OVERLOADS( debugCommand_, pykd::debugCommand, 1, 3 );
BOOST_PYTHON_FUNCTION_OVERLOADS( dprint_, pykd::dprint, 1, 2 );
BOOST_PYTHON_FUNCTION_OVERLOADS( dprintln_, pykd::dprintln, 1, 2 );
......@@ -207,8 +207,10 @@ void pykd_init()
"Break into debugger" );
python::def( "expr", pykd::evaluate, evaluate_( python::args( "expression", "cplusplus" ),
"Evaluate windbg expression" ) );
python::def( "dbgCommand", &pykd::debugCommand,
debugCommand_( python::args( "command", "suppressOutput"), "Run a debugger's command and return it's result as a string" ) );
python::def( "dbgCommand", &pykd::debugCommand, debugCommand_( python::args(
"command", "suppressOutput", "outputMask"),
"Run a debugger's command and return it's result as a string. You can set additional outputMask" \
"if you want to get also error messages" ) );
python::def( "go", pykd::targetGo,
"Go debugging" );
python::def( "step", pykd::targetStep,
......
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