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

[0.3.x] fixed : boots_trapper can hang after restart debug

Browse Source 
git-svn-id: https://pykd.svn.codeplex.com/svn@90644 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\kernelnet_cp 2015-05-16 14:25:52 +00:00 committed by Mikhail I. Izmestev
parent 6689f6a5e6
commit 5d6383a9f7
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pykd_bootstrapper/pykd_bootstrapper_vc120.vcxproj
View File

@ -105,6 +105,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile> <ModuleDefinitionFile>export.def</ModuleDefinitionFile>
<OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile> <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
<AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'">
@ -121,6 +122,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile> <ModuleDefinitionFile>export.def</ModuleDefinitionFile>
<OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile> <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
<AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'">
@ -142,6 +144,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile> <ModuleDefinitionFile>export.def</ModuleDefinitionFile>
<OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile> <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
<AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'">
@ -163,6 +166,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile> <ModuleDefinitionFile>export.def</ModuleDefinitionFile>
<OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile> <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
<AdditionalDependencies>comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@ -201,11 +205,6 @@
<None Include="export.def" /> <None Include="export.def" />
<None Include="packages.pykd_bootstrapper_vc120.config" /> <None Include="packages.pykd_bootstrapper_vc120.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\kdlibcpp\source\kdlib_vc120.vcxproj">
<Project>{3e9c538f-f060-4e86-ab7d-d44439615b63}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc" /> <ResourceCompile Include="version.rc" />
</ItemGroup> </ItemGroup>

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 8 #define PYKDEXT_VERSION_BUILDNO 9
#define __VER_STR2__(x) #x #define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x) #define __VER_STR1__(x) __VER_STR2__(x)

2
pykd_bootstrapper/windbgext.cpp
View File

@ -180,6 +180,8 @@ public:
{ {
delete m_globalInterpreter; delete m_globalInterpreter;
m_globalInterpreter = 0; m_globalInterpreter = 0;
PyThreadState_Swap(m_globalState);
m_globalState = PyEval_SaveThread();
} }
void start() void start()