zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-21 04:13:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[pykd_bootstrapper] fixed : !pykd.install outputs an error message

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@90386 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2015-04-15 14:19:04 +00:00 committed by Mikhail I. Izmestev
parent fa7ea2de18
commit 1724a42cdb
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pykd_bootstrapper/version.h
View File

@ -3,7 +3,7 @@
#define PYKDEXT_VERSION_MAJOR 1 #define PYKDEXT_VERSION_MAJOR 1
#define PYKDEXT_VERSION_MINOR 0 #define PYKDEXT_VERSION_MINOR 0
#define PYKDEXT_VERSION_SUBVERSION 1 #define PYKDEXT_VERSION_SUBVERSION 1
#define PYKDEXT_VERSION_BUILDNO 2 #define PYKDEXT_VERSION_BUILDNO 3
#define __VER_STR2__(x) #x #define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x) #define __VER_STR1__(x) __VER_STR2__(x)

9
pykd_bootstrapper/windbgext.cpp
View File

@ -220,8 +220,6 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdBootsTrapper, py)
} }
else else
{ {
std::string scriptFileName = getScriptFileName(args[0]);
// óñòàíàâèëèâàåì ïèòîíîâñêèå àðãóìåíòû // óñòàíàâèëèâàåì ïèòîíîâñêèå àðãóìåíòû
char **pythonArgs = new char*[args.size()]; char **pythonArgs = new char*[args.size()];
@ -348,7 +346,6 @@ void PykdBootsTrapper::setUp()
python::object main_namespace = main.attr("__dict__"); python::object main_namespace = main.attr("__dict__");
// Python debug output console helper classes // Python debug output console helper classes
python::class_<::DbgOut>("dout", "dout", python::no_init) python::class_<::DbgOut>("dout", "dout", python::no_init)
.def("write", &::DbgOut::write) .def("write", &::DbgOut::write)
@ -360,6 +357,12 @@ void PykdBootsTrapper::setUp()
.def("readline", &::DbgIn::readline) .def("readline", &::DbgIn::readline)
.add_property("encoding", &::DbgIn::encoding); .add_property("encoding", &::DbgIn::encoding);
python::object sys = python::import("sys");
sys.attr("stdout") = python::object(::DbgOut());
sys.attr("stderr") = python::object(::DbgOut());
sys.attr("stdin") = python::object(::DbgIn());
m_pyState = PyEval_SaveThread(); m_pyState = PyEval_SaveThread();
} }

4
setup/setup.py
View File

@ -8,7 +8,7 @@ import zipfile
_name = "pykd" _name = "pykd"
_desc = "python windbg extension" _desc = "python windbg extension"
_version = '0.3.0.21' _version = '0.3.0.22'
def makeWheel(args): def makeWheel(args):
@ -81,7 +81,7 @@ def makeZip(args):
else: else:
assert(0) assert(0)
zip_str = "pykd-%s-py27-%s.zip" % ( _version, args.plat_name ) zip_str = "pykd-%s-py27-%s" % ( _version, args.plat_name )
zip_name = zip_str + ".zip" zip_name = zip_str + ".zip"
assert(os.path.isdir(bin_dir)) assert(os.path.isdir(bin_dir))