From 27d34f5c30c0c9c57a64585d681d055b9c85a919 Mon Sep 17 00:00:00 2001 From: "SND\\ussrhero_cp" Date: Thu, 1 Jan 2015 23:17:39 +0000 Subject: [PATCH] [0.3.x] fixed : issue #13386 ( WinDbg crash: !py ) git-svn-id: https://pykd.svn.codeplex.com/svn@89560 9b283d60-5439-405e-af05-b73fd8c4d996 --- pykd/windbgext.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pykd/windbgext.cpp b/pykd/windbgext.cpp index f895923..b11c996 100644 --- a/pykd/windbgext.cpp +++ b/pykd/windbgext.cpp @@ -25,10 +25,6 @@ bool PykdExt::isInit() { extern "C" void initpykd(); -//pykd::DbgOut pykdOut; -//pykd::DbgOut pykdErr; -//pykd::DbgIn pykdIn; - void PykdExt::setUp() { @@ -58,11 +54,6 @@ void PykdExt::setUp() main_namespace[ key ] = pykd_namespace[ key ]; } - //// перенаправление стандартных потоков ВВ - //kdlib::dbgout =&pykdOut; - //kdlib::dbgerr = &pykdErr; - //kdlib::dbgin = &pykdIn; - python::object sys = python::import("sys"); sys.attr("stdout") = python::object( pykd::DbgOut() ); @@ -130,7 +121,7 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdExt, py) if ( scriptFileName.empty() ) { - pykd::eprintln( L"script file not found" ); + kdlib::eprintln( L"script file not found" ); return; } @@ -246,10 +237,10 @@ void PykdExt::startConsole() void PykdExt::printUsage() { - pykd::dprintln( L"usage: !py [options] [file]" ); - pykd::dprintln( L"Options:" ); - pykd::dprintln( L"-g --global : run code in the common namespace" ); - pykd::dprintln( L"-l --local : run code in the isolate namespace" ); + kdlib::dprintln( L"usage: !py [options] [file]" ); + kdlib::dprintln( L"Options:" ); + kdlib::dprintln( L"-g --global : run code in the common namespace" ); + kdlib::dprintln( L"-l --local : run code in the isolate namespace" ); } ///////////////////////////////////////////////////////////////////////////////