Enable pykd for python 3.10.

Signed-off-by: Colin Xu <colin.xu@gmail.com>

.gitignore

@@ -0,0 +1,2 @@
+*.pyc
+.vs

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "kdlibcpp"]
 	path = kdlibcpp
-	url = https://githomelab.ru/kdlibcpp/kdlibcpp.git
+	url = https://github.com/ivellioscolin/kdlibcpp.git

README.md

@@ -1,4 +1,4 @@
-# Pykd - python extension for WinDBG
+# Pykd - not only python extension for WinDBG
 
 ## Purpose
 This project can help to automate debugging and crash dump analysis using Python. It allows one to take the best from both worlds: the expressiveness and convenience of Python with the power of WinDbg!
@@ -6,16 +6,37 @@ This project can help to automate debugging and crash dump analysis using Python
 ## Why do I need this?
 If you want to automate the debugger but dislike the WinDbg built-in script machine syntax it's time to try again using the handy and powerful Python language. Even if you don't want to create your own script, maybe some existing scripts will be of interest to you?
 
-## Pykd bootstrapper
+## Getting started
-Use it to run pykd within windbg. [link](https://githomelab.ru/pykd/pykd-ext)
+* You should have installed python. Supported python: 2.7, 3.5 - 3.9
+* Install pykd with command: 'pip install pykd'
+* Use windbg extension (bootstrapper) to run pykd with windbg
 
-## Releases:
+## Windbg extension (bootstarpper)
-[Last Release](/../wikis/Last Release)
+Use it to run pykd within windbg.     
+[Home Page](https://githomelab.ru/pykd/pykd-ext)     
+[Download](https://githomelab.ru/pykd/pykd-ext/wikis/Downloads)   
+
+## Releases
+Just run 'pip install pykd' to install or 'pip install pykd --upgrade' to upgrade to the last version   
+[PyPi](https://pypi.org/project/pykd)   
+[All Releases](/../wikis/All Releases)  
 
 ## Documentation
+[Wiki Home](/../wikis/Home)    
 [User Manual](/../wikis/User Manual rus)    
 [API Reference](/../wikis/API Reference)   
 
+## Useful tools for pykd and WinDBG
+[windbg-pack](https://githomelab.ru/pykd/windbg-pack)    
+Set of python scripts for WinDBG
+
+[pykdwin](https://githomelab.ru/pykd/pykdwin)   
+A library with auxiliary modules for writing small pykd scripts and daily use.
+
+[windbg-kernel](https://githomelab.ru/pykd/windbg-kernel)    
+Set of pykd script for kernel debugging
+
+
 ## How to build ?
 * install VS 2017     
 https://visualstudio.microsoft.com/downloads/
@@ -33,3 +54,13 @@ git clone --recurse-submodules https://githomelab.ru/pykd/pykd.git local_dir
 ```
 * open pykd.sln 
 * choose a python version and a target platform then build pykd projects
+
+## Projects used pykd
+[mona.py](https://github.com/corelan/mona)    
+the exploit writer's swiss army knife
+
+[flare-dbg](https://github.com/fireeye/flare-dbg)    
+flare-dbg is a project meant to aid malware reverse engineers in rapidly developing debugger scripts. 
+
+[voltron](https://github.com/snare/voltron)    
+Voltron is an extensible debugger UI toolkit written in Python

kdlibcpp

@@ -1 +1 @@
-Subproject commit b92e0fbcc0628b2e8dc320f79a2bb9464b8d9908
+Subproject commit e54598d2f904acab23d340c93ce77c551a396ecb

pykd.sln

@@ -42,75 +42,126 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_2.7|Win32 = Debug_2.7|Win32
 		Debug_2.7|x64 = Debug_2.7|x64
+		Debug_3.10|Win32 = Debug_3.10|Win32
+		Debug_3.10|x64 = Debug_3.10|x64
 		Debug_3.5|Win32 = Debug_3.5|Win32
 		Debug_3.5|x64 = Debug_3.5|x64
 		Debug_3.6|Win32 = Debug_3.6|Win32
 		Debug_3.6|x64 = Debug_3.6|x64
 		Debug_3.7|Win32 = Debug_3.7|Win32
 		Debug_3.7|x64 = Debug_3.7|x64
+		Debug_3.8|Win32 = Debug_3.8|Win32
+		Debug_3.8|x64 = Debug_3.8|x64
+		Debug_3.9|Win32 = Debug_3.9|Win32
+		Debug_3.9|x64 = Debug_3.9|x64
 		Release_2.7|Win32 = Release_2.7|Win32
 		Release_2.7|x64 = Release_2.7|x64
+		Release_3.10|Win32 = Release_3.10|Win32
+		Release_3.10|x64 = Release_3.10|x64
 		Release_3.5|Win32 = Release_3.5|Win32
 		Release_3.5|x64 = Release_3.5|x64
 		Release_3.6|Win32 = Release_3.6|Win32
 		Release_3.6|x64 = Release_3.6|x64
 		Release_3.7|Win32 = Release_3.7|Win32
 		Release_3.7|x64 = Release_3.7|x64
+		Release_3.8|Win32 = Release_3.8|Win32
+		Release_3.8|x64 = Release_3.8|x64
+		Release_3.9|Win32 = Release_3.9|Win32
+		Release_3.9|x64 = Release_3.9|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_2.7|Win32.Build.0 = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_2.7|x64.ActiveCfg = Debug|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.10|Win32.ActiveCfg = Debug|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.10|x64.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.5|Win32.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.5|x64.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.6|Win32.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.6|x64.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.7|Win32.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.7|x64.ActiveCfg = Debug|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.8|Win32.ActiveCfg = Debug|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.8|x64.ActiveCfg = Debug|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.9|Win32.ActiveCfg = Debug|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.9|x64.ActiveCfg = Debug|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_2.7|Win32.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_2.7|x64.ActiveCfg = Release|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.10|Win32.ActiveCfg = Release|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.10|x64.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.5|Win32.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.5|x64.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.6|Win32.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.6|x64.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.7|Win32.ActiveCfg = Release|Any CPU
 		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.7|x64.ActiveCfg = Release|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.8|Win32.ActiveCfg = Release|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.8|x64.ActiveCfg = Release|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.9|Win32.ActiveCfg = Release|Any CPU
+		{3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.9|x64.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_2.7|x64.ActiveCfg = Debug|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.10|Win32.ActiveCfg = Debug_3.10|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.10|x64.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.5|Win32.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.5|x64.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.6|Win32.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.6|x64.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.7|Win32.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.7|x64.ActiveCfg = Debug|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.8|Win32.ActiveCfg = Debug|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.8|x64.ActiveCfg = Debug|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.9|Win32.ActiveCfg = Debug|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.9|x64.ActiveCfg = Debug|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_2.7|Win32.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_2.7|x64.ActiveCfg = Release|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.10|Win32.ActiveCfg = Release|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.10|x64.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.5|Win32.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.5|x64.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.6|Win32.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.6|x64.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.7|Win32.ActiveCfg = Release|Any CPU
 		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.7|x64.ActiveCfg = Release|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.8|Win32.ActiveCfg = Release|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.8|x64.ActiveCfg = Release|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.9|Win32.ActiveCfg = Release|Any CPU
+		{6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.9|x64.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_2.7|x64.ActiveCfg = Debug|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.10|Win32.ActiveCfg = Debug|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.10|x64.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.5|Win32.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.5|x64.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.6|Win32.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.6|x64.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.7|Win32.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.7|x64.ActiveCfg = Debug|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.8|Win32.ActiveCfg = Debug|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.8|x64.ActiveCfg = Debug|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.9|Win32.ActiveCfg = Debug|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.9|x64.ActiveCfg = Debug|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_2.7|Win32.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_2.7|x64.ActiveCfg = Release|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.10|Win32.ActiveCfg = Release|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.10|x64.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.5|Win32.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.5|x64.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.6|Win32.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.6|x64.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.7|Win32.ActiveCfg = Release|Any CPU
 		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.7|x64.ActiveCfg = Release|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.8|Win32.ActiveCfg = Release|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.8|x64.ActiveCfg = Release|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.9|Win32.ActiveCfg = Release|Any CPU
+		{D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.9|x64.ActiveCfg = Release|Any CPU
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|Win32.ActiveCfg = Debug|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|Win32.Build.0 = Debug|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|x64.ActiveCfg = Debug|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|x64.Build.0 = Debug|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.10|Win32.ActiveCfg = Debug_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.10|x64.ActiveCfg = Debug|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.10|x64.Build.0 = Debug|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|Win32.ActiveCfg = Debug|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|Win32.Build.0 = Debug|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|x64.ActiveCfg = Debug|x64
@@ -123,10 +174,22 @@ Global
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.7|Win32.Build.0 = Debug|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.7|x64.ActiveCfg = Debug|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.7|x64.Build.0 = Debug|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|Win32.ActiveCfg = Debug|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|Win32.Build.0 = Debug|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|x64.ActiveCfg = Debug|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|x64.Build.0 = Debug|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|Win32.ActiveCfg = Debug|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|Win32.Build.0 = Debug|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|x64.ActiveCfg = Debug|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|x64.Build.0 = Debug|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|Win32.ActiveCfg = Release_Static|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|Win32.Build.0 = Release_Static|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|x64.ActiveCfg = Release_Static|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|x64.Build.0 = Release_Static|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.10|Win32.ActiveCfg = Release_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.10|Win32.Build.0 = Release_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.10|x64.ActiveCfg = Release_Static|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.10|x64.Build.0 = Release_Static|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.5|Win32.ActiveCfg = Release_Static|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.5|Win32.Build.0 = Release_Static|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.5|x64.ActiveCfg = Release_Static|x64
@@ -139,10 +202,22 @@ Global
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.7|Win32.Build.0 = Release_Static|Win32
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.7|x64.ActiveCfg = Release_Static|x64
 		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.7|x64.Build.0 = Release_Static|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|Win32.ActiveCfg = Release_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|Win32.Build.0 = Release_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|x64.ActiveCfg = Release_Static|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|x64.Build.0 = Release_Static|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|Win32.ActiveCfg = Release_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|Win32.Build.0 = Release_Static|Win32
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|x64.ActiveCfg = Release_Static|x64
+		{3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|x64.Build.0 = Release_Static|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|Win32.ActiveCfg = Debug_2.7|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|Win32.Build.0 = Debug_2.7|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|x64.ActiveCfg = Debug_2.7|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|x64.Build.0 = Debug_2.7|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.10|Win32.ActiveCfg = Debug_3.10|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.10|Win32.Build.0 = Debug_3.10|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.10|x64.ActiveCfg = Debug_3.10|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.10|x64.Build.0 = Debug_3.10|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.5|Win32.ActiveCfg = Debug_3.5|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.5|Win32.Build.0 = Debug_3.5|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.5|x64.ActiveCfg = Debug_3.5|x64
@@ -155,10 +230,22 @@ Global
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.7|Win32.Build.0 = Debug_3.7|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.7|x64.ActiveCfg = Debug_3.7|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.7|x64.Build.0 = Debug_3.7|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|Win32.ActiveCfg = Debug_3.8|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|Win32.Build.0 = Debug_3.8|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|x64.ActiveCfg = Debug_3.8|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|x64.Build.0 = Debug_3.8|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|Win32.ActiveCfg = Debug_3.9|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|Win32.Build.0 = Debug_3.9|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|x64.ActiveCfg = Debug_3.9|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|x64.Build.0 = Debug_3.9|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|Win32.ActiveCfg = Release_2.7|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|Win32.Build.0 = Release_2.7|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|x64.ActiveCfg = Release_2.7|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|x64.Build.0 = Release_2.7|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.10|Win32.ActiveCfg = Release_3.10|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.10|Win32.Build.0 = Release_3.10|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.10|x64.ActiveCfg = Release_3.10|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.10|x64.Build.0 = Release_3.10|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.5|Win32.ActiveCfg = Release_3.5|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.5|Win32.Build.0 = Release_3.5|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.5|x64.ActiveCfg = Release_3.5|x64
@@ -171,10 +258,21 @@ Global
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.7|Win32.Build.0 = Release_3.7|Win32
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.7|x64.ActiveCfg = Release_3.7|x64
 		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.7|x64.Build.0 = Release_3.7|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|Win32.ActiveCfg = Release_3.8|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|Win32.Build.0 = Release_3.8|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|x64.ActiveCfg = Release_3.8|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|x64.Build.0 = Release_3.8|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|Win32.ActiveCfg = Release_3.9|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|Win32.Build.0 = Release_3.9|Win32
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|x64.ActiveCfg = Release_3.9|x64
+		{C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|x64.Build.0 = Release_3.9|x64
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|Win32.ActiveCfg = Debug|Win32
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|Win32.Build.0 = Debug|Win32
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|x64.ActiveCfg = Debug|x64
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|x64.Build.0 = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.10|Win32.ActiveCfg = Debug_3.10|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.10|x64.ActiveCfg = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.10|x64.Build.0 = Debug|x64
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.5|Win32.ActiveCfg = Debug|Win32
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.5|Win32.Build.0 = Debug|Win32
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.5|x64.ActiveCfg = Debug|x64
@@ -187,22 +285,42 @@ Global
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.7|Win32.Build.0 = Debug|Win32
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.7|x64.ActiveCfg = Debug|x64
 		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.7|x64.Build.0 = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.ActiveCfg = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|Win32.ActiveCfg = Debug|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.Build.0 = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|Win32.Build.0 = Debug|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.ActiveCfg = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|x64.ActiveCfg = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.Build.0 = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|x64.Build.0 = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.ActiveCfg = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|Win32.ActiveCfg = Debug|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.Build.0 = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|Win32.Build.0 = Debug|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.ActiveCfg = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|x64.ActiveCfg = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.Build.0 = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|x64.Build.0 = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.ActiveCfg = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.ActiveCfg = Debug|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.Build.0 = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.Build.0 = Debug|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.ActiveCfg = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.ActiveCfg = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.Build.0 = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.Build.0 = Debug|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.ActiveCfg = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.10|Win32.ActiveCfg = Release|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.Build.0 = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.10|Win32.Build.0 = Release|Win32
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.ActiveCfg = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.10|x64.ActiveCfg = Release|x64
-		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.Build.0 = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.10|x64.Build.0 = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.ActiveCfg = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.Build.0 = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.ActiveCfg = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.Build.0 = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.ActiveCfg = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.Build.0 = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.ActiveCfg = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.Build.0 = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.ActiveCfg = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.Build.0 = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.ActiveCfg = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.Build.0 = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|Win32.ActiveCfg = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|Win32.Build.0 = Debug|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|x64.ActiveCfg = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|x64.Build.0 = Debug|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|Win32.ActiveCfg = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|Win32.Build.0 = Release|Win32
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|x64.ActiveCfg = Release|x64
+		{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

pykd/boost.python/exec.cpp

@@ -105,7 +105,11 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
   // should be 'char const *' but older python versions don't use 'const' yet.
   char *f = const_cast<char *>(filename);
   // Let python open the file to avoid potential binary incompatibilities.
-#if PY_VERSION_HEX >= 0x03040000
+#if PY_VERSION_HEX >= 0x030a0000
+  PyObject* fo = Py_BuildValue("s", f);
+  FILE* fs = _Py_fopen_obj(fo, "r");
+  Py_DECREF(fo);
+#elif PY_VERSION_HEX >= 0x03040000
   FILE *fs = _Py_fopen(f, "r");
 #elif PY_VERSION_HEX >= 0x03000000
   PyObject *fo = Py_BuildValue("s", f);

pykd/packages.config

@@ -11,6 +11,10 @@
   <package id="Python35" version="3.5.1.1" targetFramework="Native" />
   <package id="Python36" version="3.6.0" targetFramework="Native" />
   <package id="Python37" version="1.0.0.1" targetFramework="Native" />
+  <package id="Python38" version="3.8.0" targetFramework="Native" />
+  <package id="Python39" version="3.9.0" targetFramework="Native" />
+  <package id="python" version="3.10.10" allowedVersions="[3.10.0,3.11.0)" targetFramework="native" />
+  <package id="pythonx86" version="3.10.10" allowedVersions="[3.10.0,3.11.0)" targetFramework="native" />
   <package id="clang-cmake" version="6.0.0.1" targetFramework="Native" />
   <package id="llvm-cmake" version="6.0.0.1" targetFramework="Native" />
 </packages>

pykd/pycpucontext.cpp

@@ -69,14 +69,14 @@ std::wstring getRegisterName(unsigned long index)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-python::list getCurrentStack()
+python::list getStack(bool inlineFrames)
 {
     kdlib::StackPtr  stack;
     unsigned long  numberFrames;
 
     do {
         AutoRestorePyState  pystate;
-        stack = kdlib::getStack();
+        stack = kdlib::getStack(inlineFrames);
         numberFrames = stack->getFrameCount();
     } while(false);
 
@@ -242,6 +242,37 @@ python::dict StackFrameAdapter::getLocalsDict(kdlib::StackFramePtr& frame)
 
 ///////////////////////////////////////////////////////////////////////////////
 
+python::tuple StackFrameAdapter::findSymbol(kdlib::StackFramePtr& frame)
+{
+    kdlib::MEMDISPLACEMENT  displacement;
+    std::wstring  symbolName;
+    std::wstring  moduleName;
+
+    {
+        AutoRestorePyState  pystate;
+        symbolName = frame->findSymbol(displacement);
+        moduleName = kdlib::getModuleName(kdlib::findModuleBase(frame->getIP()));
+    }
+
+    return python::make_tuple(moduleName, symbolName, displacement);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+python::tuple  StackFrameAdapter::getSourceLine(kdlib::StackFramePtr& frame)
+{
+    std::wstring  fileName;
+    unsigned long  lineno;
+
+    do {
+        AutoRestorePyState  pystate;
+        frame->getSourceLine(fileName, lineno);
+    } while (false);
+
+    return python::make_tuple(fileName, lineno);
+}
+///////////////////////////////////////////////////////////////////////////////
+
 python::tuple CPUContextAdapter::getRegisterByIndex(unsigned long index)
 {
 

pykd/pycpucontext.h

@@ -70,6 +70,16 @@ public:
         AutoRestorePyState  pystate;
         frame->switchTo();
     }
+
+    static python::tuple findSymbol(kdlib::StackFramePtr& frame);
+
+    static bool isInline(kdlib::StackFramePtr& frame)
+    {
+        AutoRestorePyState  pystate;
+        return frame->isInline();
+    }
+
+    static python::tuple getSourceLine(kdlib::StackFramePtr& frame);
 };
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -157,7 +167,7 @@ inline void switchProcessorMode() {
     kdlib::switchCPUMode();
 }
 
-python::list getCurrentStack();
+python::list getStack(bool inlineFrames = false);
 
 inline kdlib::StackFramePtr getCurrentFrame() {
     AutoRestorePyState  pystate;

pykd/pydbgeng.cpp

@@ -163,6 +163,19 @@ python::list getLocalProcesses()
 
 ///////////////////////////////////////////////////////////////////////////////
 
+std::wstring getHostProcessPath()
+{
+    AutoRestorePyState  pystate;
+
+    std::vector<WCHAR>  fileNameBuffer(0x1000);
+
+    DWORD fileNameSize = GetModuleFileNameW(NULL, &fileNameBuffer.front(), fileNameBuffer.size() );
+
+    return std::wstring(&fileNameBuffer.front(), fileNameSize);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 python::tuple getBugCheckData()
 {
     kdlib::SystemCrashInfo  crashInfo = {};
@@ -213,4 +226,20 @@ std::wstring printSyntheticSymbol(const kdlib::SyntheticSymbol& syntheticSymbol)
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void addSyntheticModule(kdlib::MEMOFFSET_64 base, unsigned long size, const std::wstring &name, const std::wstring &path /*= std::wstring{}*/)
+{
+    AutoRestorePyState pystate;
+    return kdlib::addSyntheticModule(base, size, name, path);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void removeSyntheticModule(kdlib::MEMOFFSET_64 base)
+{
+    AutoRestorePyState pystate;
+    return kdlib::removeSyntheticModule(base);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 } //end namespace pykd

pykd/pydbgeng.h

@@ -19,10 +19,10 @@ kdlib::PROCESS_DEBUG_ID startProcess(const std::wstring  &processName, const kdl
 }
 
 inline
-kdlib::PROCESS_DEBUG_ID attachProcess(kdlib::PROCESS_ID pid)
+kdlib::PROCESS_DEBUG_ID attachProcess(kdlib::PROCESS_ID pid, const kdlib::ProcessDebugFlags& flags = kdlib::ProcessDebugDefault)
 {
     AutoRestorePyState  pystate;
-    return kdlib::attachProcess(pid);
+    return kdlib::attachProcess(pid, flags);
 }
 
 inline
@@ -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 )
@@ -133,6 +133,34 @@ void changeDebugOptions(kdlib::DebugOptionsSet &addOptions, kdlib::DebugOptionsS
     kdlib::changeDebugOptions(addOptions, removeOptions);
 }
 
+inline
+kdlib::OutputFlagsSet getOutputMask()
+{
+    AutoRestorePyState  pystate;
+    return kdlib::getOutputFlags();
+}
+
+inline
+void setOutputMask(const kdlib::OutputFlagsSet& outputMask)
+{
+    AutoRestorePyState  pystate;
+    kdlib::setOutputFlags(outputMask);
+}
+
+inline
+kdlib::DumpType getDumpType()
+{
+    AutoRestorePyState  pystate;
+    return kdlib::getDumpType();
+}
+
+inline
+kdlib::DumpFormatFlagsSet getDumpFormat()
+{
+    AutoRestorePyState  pystate;
+    return kdlib::getDumpFormat();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 // processes end threads
@@ -279,6 +307,7 @@ inline void setImplicitProcess(kdlib::MEMOFFSET_64 offset)
     AutoRestorePyState  pystate;
     kdlib::setImplicitProcess(offset);
 }
+
 inline kdlib::MEMOFFSET_64 getImplicitProcessOffset()
 {
     AutoRestorePyState  pystate;
@@ -290,6 +319,8 @@ python::list getProcessThreads();
 python::list getTargetProcesses();
 python::list getLocalProcesses();
 
+std::wstring getHostProcessPath();
+
 ///////////////////////////////////////////////////////////////////////////////
 
 inline
@@ -456,6 +487,9 @@ kdlib::SyntheticSymbol addSyntheticSymbol( kdlib::MEMOFFSET_64 offset, unsigned
 void removeSyntheticSymbol(const kdlib::SyntheticSymbol& syntheticSymbol);
 std::wstring printSyntheticSymbol(const kdlib::SyntheticSymbol& syntheticSymbol);
 
+void addSyntheticModule(kdlib::MEMOFFSET_64 base, unsigned long size, const std::wstring &name, const std::wstring &path = std::wstring{});
+void removeSyntheticModule(kdlib::MEMOFFSET_64 base);
+
 ///////////////////////////////////////////////////////////////////////////////
 
 } //end namespace pykd

pykd/pydbgio.h

@@ -49,6 +49,12 @@ inline void dinput(const std::wstring &str)
     kdlib::dinput(str);
 }
 
+inline void setStatusMessage(const std::wstring &str)
+{
+    AutoRestorePyState  pystate;
+    kdlib::setStatusMessage(str);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 class DbgOut : public  kdlib::windbg::WindbgOut

pykd/pyeventhandler.cpp

@@ -468,7 +468,7 @@ void EventHandler::onChangeBreakpoints()
 
 /////////////////////////////////////////////////////////////////////////////////
 
-void EventHandler::onDebugOutput(const std::wstring& text)
+void EventHandler::onDebugOutput(const std::wstring& text, kdlib::OutputFlag flag)
 {
     PyEval_RestoreThread( m_pystate );
 
@@ -477,7 +477,7 @@ void EventHandler::onDebugOutput(const std::wstring& text)
         python::override pythonHandler = get_override("onDebugOutput");
         if ( pythonHandler )
         {
-            pythonHandler(text);
+            pythonHandler(text, flag);
         }
     }
     catch (const python::error_already_set &) 

pykd/pyeventhandler.h

@@ -28,21 +28,21 @@ public:
 
     EventHandler();
 
-    virtual kdlib::DebugCallbackResult onBreakpoint( kdlib::BREAKPOINT_ID bpId );
+    kdlib::DebugCallbackResult onBreakpoint( kdlib::BREAKPOINT_ID bpId ) override;
-    virtual kdlib::DebugCallbackResult onException( const kdlib::ExceptionInfo &exceptionInfo );
+    kdlib::DebugCallbackResult onException( const kdlib::ExceptionInfo &exceptionInfo ) override;
-    virtual kdlib::DebugCallbackResult onModuleLoad( kdlib::MEMOFFSET_64 offset, const std::wstring &name );
+    kdlib::DebugCallbackResult onModuleLoad( kdlib::MEMOFFSET_64 offset, const std::wstring &name ) override;
-    virtual kdlib::DebugCallbackResult onModuleUnload( kdlib::MEMOFFSET_64 offset, const std::wstring &name );
+    kdlib::DebugCallbackResult onModuleUnload( kdlib::MEMOFFSET_64 offset, const std::wstring &name ) override;
-    virtual kdlib::DebugCallbackResult onThreadStart();
+    kdlib::DebugCallbackResult onThreadStart() override;
-    virtual kdlib::DebugCallbackResult onThreadStop();
+    kdlib::DebugCallbackResult onThreadStop() override;
 
-    virtual void onExecutionStatusChange(kdlib::ExecutionStatus executionStatus);
+    void onExecutionStatusChange(kdlib::ExecutionStatus executionStatus) override;
-    virtual void onCurrentThreadChange(kdlib::THREAD_DEBUG_ID  threadid);
+    void onCurrentThreadChange(kdlib::THREAD_DEBUG_ID  threadid) override;
-    virtual void onChangeLocalScope();
+    void onChangeLocalScope() override;
-    virtual void onChangeSymbolPaths();
+    void onChangeSymbolPaths() override;
-    virtual void onChangeBreakpoints();
+    void onChangeBreakpoints() override;
-    virtual void onDebugOutput(const std::wstring& text);
+    void onDebugOutput(const std::wstring& text, kdlib::OutputFlag  flag) override;
-    virtual void onStartInput();
+    void onStartInput() override;
-    virtual void onStopInput();
+    void onStopInput() override;
 
 private:
 

pykd/pykd.vcxproj

@@ -9,6 +9,14 @@
       <Configuration>Debug_2.7</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_3.10|Win32">
+      <Configuration>Debug_3.10</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_3.10|x64">
+      <Configuration>Debug_3.10</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_3.5|Win32">
       <Configuration>Debug_3.5</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +41,22 @@
       <Configuration>Debug_3.7</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_3.8|Win32">
+      <Configuration>Debug_3.8</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_3.8|x64">
+      <Configuration>Debug_3.8</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_3.9|Win32">
+      <Configuration>Debug_3.9</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug_3.9|x64">
+      <Configuration>Debug_3.9</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release_2.7|Win32">
       <Configuration>Release_2.7</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +65,14 @@
       <Configuration>Release_2.7</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_3.10|Win32">
+      <Configuration>Release_3.10</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_3.10|x64">
+      <Configuration>Release_3.10</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release_3.5|Win32">
       <Configuration>Release_3.5</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +97,22 @@
       <Configuration>Release_3.7</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_3.8|Win32">
+      <Configuration>Release_3.8</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_3.8|x64">
+      <Configuration>Release_3.8</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_3.9|Win32">
+      <Configuration>Release_3.9</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_3.9|x64">
+      <Configuration>Release_3.9</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C4C45791-0201-4406-BC5C-A384B01E3BF5}</ProjectGuid>
@@ -108,6 +156,30 @@
     <PythonVersion>3.7</PythonVersion>
     <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.8</PythonVersion>
+    <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.9</PythonVersion>
+    <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.10</PythonVersion>
+    <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -140,6 +212,30 @@
     <PythonVersion>3.7</PythonVersion>
     <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.8</PythonVersion>
+    <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.9</PythonVersion>
+    <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.10</PythonVersion>
+    <LLVM_USE_CRT_DEBUG>MDd</LLVM_USE_CRT_DEBUG>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -176,6 +272,33 @@
     <PythonVersion>3.7</PythonVersion>
     <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.8</PythonVersion>
+    <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.9</PythonVersion>
+    <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.10</PythonVersion>
+    <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -212,7 +335,33 @@
     <PythonVersion>3.7</PythonVersion>
     <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
   </PropertyGroup>
-
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.8</PythonVersion>
+    <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.9</PythonVersion>
+    <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <PythonVersion>3.10</PythonVersion>
+    <LLVM_USE_CRT_RELEASE>MT</LLVM_USE_CRT_RELEASE>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -228,6 +377,15 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.7|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -240,6 +398,15 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.7|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -252,6 +419,15 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.7|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -264,6 +440,15 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.7|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <NuGetPackageImportStamp>bb9fbdf7</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -299,6 +484,30 @@
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <TargetName>$(ProjectName)</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <TargetName>$(ProjectName)</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <TargetName>$(ProjectName)</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'">
     <LinkIncremental>true</LinkIncremental>
     <TargetExt>.pyd</TargetExt>
@@ -331,6 +540,30 @@
     <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
+    <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetExt>.pyd</TargetExt>
@@ -359,6 +592,27 @@
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <TargetName>$(ProjectName)</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <TargetName>$(ProjectName)</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <TargetName>$(ProjectName)</TargetName>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetExt>.pyd</TargetExt>
@@ -387,6 +641,27 @@
     <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.pyd</TargetExt>
+    <TargetName>$(ProjectName)</TargetName>
+    <OutDir>$(SolutionDir)out\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -476,6 +751,72 @@
       </Command>
     </CustomBuildStep>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;$(SolutionDir)packages\pythonx86.3.10.10\tools\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)packages\pythonx86.3.10.10\tools\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -564,6 +905,72 @@
       </Command>
     </CustomBuildStep>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.8|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.9|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_3.10|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;$(SolutionDir)packages\python.3.10.10\tools\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)packages\python.3.10.10\tools\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+    <CustomBuildStep>
+      <Command>
+      </Command>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -584,7 +991,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.5|Win32'">
@@ -607,7 +1014,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.6|Win32'">
@@ -630,7 +1037,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.7|Win32'">
@@ -652,6 +1059,75 @@
       <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;$(SolutionDir)packages\pythonx86.3.10.10\tools\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)packages\pythonx86.3.10.10\tools\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
     <PostBuildEvent>
       <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
@@ -676,7 +1152,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.5|x64'">
@@ -699,7 +1175,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.6|x64'">
@@ -722,7 +1198,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.7|x64'">
@@ -744,6 +1220,75 @@
       <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.8|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Debug\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.9|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_3.10|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include;$(SolutionDir)packages\python.3.10.10\tools\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>pykd.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)packages\python.3.10.10\tools\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
     <PostBuildEvent>
       <Command>copy $(OutDir)..\Release\targetapp.exe $(OutDir)</Command>
     </PostBuildEvent>
@@ -901,6 +1446,8 @@
     <Import Project="$(SolutionDir)\packages\Python35.3.5.1.1\build\python35.targets" Condition="'$(PythonVersion)'=='3.5' AND Exists('$(SolutionDir)\packages\Python35.3.5.1.1\build\python35.targets')" />
     <Import Project="$(SolutionDir)\packages\Python36.3.6.0\build\python36.targets" Condition="'$(PythonVersion)'=='3.6' AND Exists('$(SolutionDir)\packages\Python36.3.6.0\build\python36.targets')" />
     <Import Project="$(SolutionDir)\packages\Python37.1.0.0.1\build\python37.targets" Condition="'$(PythonVersion)'=='3.7' AND Exists('$(SolutionDir)\packages\Python37.1.0.0.1\build\python37.targets')" />
+    <Import Project="$(SolutionDir)\packages\Python38.3.8.0\build\python38.targets" Condition="'$(PythonVersion)'=='3.8' AND Exists('$(SolutionDir)\packages\Python38.3.8.0\build\python38.targets')" />
+    <Import Project="$(SolutionDir)\packages\Python39.3.9.0\build\python39.targets" Condition="'$(PythonVersion)'=='3.9' AND Exists('$(SolutionDir)\packages\Python39.3.9.0\build\python39.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -919,5 +1466,7 @@
     <Error Condition="!Exists('$(SolutionDir)\packages\Python35.3.5.1.1\build\python35.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Python35.3.5.1\build\python35.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Python36.3.6.0\build\python36.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Python36.3.6.0\build\python36.targets')" />
     <Error Condition="!Exists('$(SolutionDir)\packages\Python37.1.0.0.1\build\python37.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Python37.1.0.0.1\build\python37.targets')" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Python38.3.8.0\build\python38.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Python38.3.8.0\build\python38.targets')" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Python39.3.9.0\build\python39.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Python39.3.9.0\build\python39.targets')" />
   </Target>
 </Project>

pykd/pykdver.h

@@ -2,7 +2,7 @@
 #define PYKD_VERSION_MAJOR      0
 #define PYKD_VERSION_MINOR      3
 #define PYKD_VERSION_SUBVERSION 4
-#define PYKD_VERSION_BUILDNO    1
+#define PYKD_VERSION_BUILDNO    15
 
 #define __VER_STR2__(x) #x
 #define __VER_STR1__(x) __VER_STR2__(x)

pykd/pymemaccess.h

@@ -266,8 +266,32 @@ inline kdlib::MemoryProtect getVaProtect( kdlib::MEMOFFSET_64 offset )
     return kdlib::getVaProtect(offset);
 }
 
+inline kdlib::MemoryState getVaState(kdlib::MEMOFFSET_64 offset)
+{
+    AutoRestorePyState  pystate;
+    return kdlib::getVaState(offset);
+}
 
+inline kdlib::MemoryType getVaType(kdlib::MEMOFFSET_64 offset)
+{
+    AutoRestorePyState  pystate;
+    return kdlib::getVaType(offset);
+}
 
+inline python::tuple getVaAttributes(kdlib::MEMOFFSET_64 offset)
+{
+    kdlib::MemoryProtect  memProtect;
+    kdlib::MemoryState  memState;
+    kdlib::MemoryType  memType;
+    {
+        AutoRestorePyState  pystate;
+        memProtect = kdlib::getVaProtect(offset);
+        memState = kdlib::getVaState(offset);
+        memType = kdlib::getVaType(offset);
+    }
+
+    return python::make_tuple(memProtect, memState, memType);
+}
 
 } // end namespace pykd
 

pykd/pymod.cpp

@@ -36,12 +36,13 @@ static const std::string pykdVersion = PYKD_VERSION_BUILD_STR
 
 
 BOOST_PYTHON_FUNCTION_OVERLOADS( startProcess_,  pykd::startProcess, 1, 2 );
+BOOST_PYTHON_FUNCTION_OVERLOADS( attachProcess_, pykd::attachProcess, 1, 2);
 BOOST_PYTHON_FUNCTION_OVERLOADS( detachProcess_,  pykd::detachProcess, 0, 1 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( terminateProcess_,  pykd::terminateProcess, 0, 1 );
 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 );
@@ -77,6 +78,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( getSourceFile_, pykd::getSourceFile, 0, 1 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( getSourceFileFromSrcSrv_, pykd::getSourceFileFromSrcSrv, 0, 1 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( getSourceLine_, pykd::getSourceLine, 0, 1 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( findSymbol_, pykd::findSymbol, 1, 2 );
+BOOST_PYTHON_FUNCTION_OVERLOADS( getStack_, pykd::getStack, 0, 1);
 
 BOOST_PYTHON_FUNCTION_OVERLOADS( getProcessOffset_, pykd::getProcessOffset, 0, 1);
 BOOST_PYTHON_FUNCTION_OVERLOADS( getProcessSystemId_, pykd::getProcessSystemId, 0, 1);
@@ -104,6 +106,10 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( TypeInfo_ptrTo, TypeInfoAdapter::ptrTo, 1, 2 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( getTypeFromSource_, pykd::getTypeFromSource, 2, 3 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( getTypeInfoProviderFromPdb_, pykd::getTypeInfoProviderFromPdb, 1, 2 );
 BOOST_PYTHON_FUNCTION_OVERLOADS( getTypeInfoProviderFromSource_, pykd::getTypeInfoProviderFromSource, 1, 2);
+BOOST_PYTHON_FUNCTION_OVERLOADS( getSymbolProviderFromSource_, pykd::getSymbolProviderFromSource, 1, 2);
+BOOST_PYTHON_FUNCTION_OVERLOADS(evalExpr_, pykd::evalExpr, 1, 3);
+
+BOOST_PYTHON_FUNCTION_OVERLOADS( addSyntheticModule_, pykd::addSyntheticModule, 3, 4 );
 
 namespace pykd {
 
@@ -157,8 +163,8 @@ void pykd_init()
 
     python::def( "startProcess", pykd::startProcess, startProcess_( boost::python::args( "commandline", "debugOptions"), 
         "Start process for debugging" ) ); 
-    python::def("attachProcess", pykd::attachProcess, 
+    python::def("attachProcess", pykd::attachProcess, attachProcess_(boost::python::args("pid", "debugOptions"),
-        "Attach debugger to a exsisting process");
+        "Attach debugger to a existing process"));
     python::def( "detachProcess", pykd::detachProcess, detachProcess_( boost::python::args( "id" ),
         "Stop process debugging") ); 
     python::def( "detachAllProcesses", pykd::detachAllProcesses, 
@@ -185,19 +191,30 @@ void pykd_init()
     python::def( "writeDump", pykd::writeDump,
         "Create memory dump file" );
     python::def( "getLocalProcesses", pykd::getLocalProcesses,
-        "Return list of runnng processes on the host system" );
+        "Return list of running processes on the host system" );
+    python::def("getHostProcessPath", pykd::getHostProcessPath,
+        "Return image path of the process running python interpreter with a pykd");
     python::def( "getDebugOptions", pykd::getDebugOptions,
         "Return debug options" );
     python::def( "changeDebugOptions", pykd::changeDebugOptions,
         "Change debug options" );
-
+    python::def("getOutputMask", pykd::getOutputMask,
+        "Get output mask");
+    python::def("setOutputMask", pykd::setOutputMask,
+        "Set output mask");
+    python::def("getDumpType", pykd::getDumpType,
+        "Return type of the dump");
+    python::def("getDumpFormat", pykd::getDumpFormat,
+        "Return format the dump");
 
     python::def( "breakin", pykd::targetBreak,
         "Break into debugger" );
     python::def( "expr", pykd::evaluate, evaluate_( python::args( "expression", "cplusplus" ),
         "Evaluate windbg expression" ) );
-    python::def( "dbgCommand", &pykd::debugCommand, 
+    python::def( "dbgCommand", &pykd::debugCommand, debugCommand_( python::args(
-        debugCommand_( python::args( "command", "suppressOutput"), "Run a debugger's command and return it's result as a string" ) );
+        "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,
@@ -205,7 +222,7 @@ void pykd_init()
     python::def( "trace", pykd::targetStepIn,
         "The target is executing a single instruction" );
     python::def("stepout", pykd::targetStepOut,
-        "The traget is executing while not returned from the current subroutine");
+        "The target is executing while not returned from the current subroutine");
     python::def("sourceStep", pykd::sourceStep,
         "The target is executing a single source line");
     python::def("sourceStepOver", pykd::sourceStepOver,
@@ -220,6 +237,8 @@ void pykd_init()
         "Print out string and insert end of line symbol. If dml = True string is printed with dml highlighting ( only for windbg )" ) );
     python::def("dinput", &pykd::dinput,
         "Provide input for debugger");
+    python::def("setStatusMessage", &pykd::setStatusMessage,
+        "Set message at a windbg status bar");
 
 
     // Python debug output console helper classes
@@ -259,7 +278,7 @@ void pykd_init()
     python::def( "isValid", pykd::isVaValid,
         "Check if the virtual address is valid" );
     python::def("isVaRegionValid", pykd::isVaRegionValid,
-        "Check if the virtaul addresses region is valid");
+        "Check if the virtual addresses region is valid");
     python::def( "compareMemory", pykd::compareMemory, compareMemory_( python::args( "offset1", "offset2", "length", "phyAddr" ),
         "Compare two memory buffers by virtual or physical addresses" ) );
     python::def( "searchMemory", pykd::searchMemoryLst, 
@@ -267,9 +286,15 @@ void pykd_init()
     python::def( "searchMemory", pykd::searchMemoryStr, 
         "Search in virtual memory" );
     python::def( "findMemoryRegion", pykd::findMemoryRegion,
-        "Return address of begining valid memory region nearest to offset" );
+        "Return address of beginning valid memory region nearest to offset" );
     python::def( "getVaProtect", pykd::getVaProtect,
-        "Return memory attributes" );
+        "Return memory protect" );
+    python::def( "getVaType", pykd::getVaType,
+        "Return memory type");
+    python::def( "getVaState", pykd::getVaState,
+        "Return memory state");
+    python::def("getVaAttributes", pykd::getVaAttributes,
+        "Return memory attributes");
 
     python::def( "ptrByte", pykd::ptrByte,
         "Read an unsigned 1-byte integer from the target memory" );
@@ -342,9 +367,9 @@ void pykd_init()
     python::def( "loadWStr", pykd::loadWStr,
         "Load string from the target buffer containing 0-terminated unicode-string" );
     python::def( "loadUnicodeString", pykd::loadUnicodeStr,
-        "Return string represention of windows UNICODE_STRING type" );
+        "Return string representation of windows UNICODE_STRING type" );
     python::def( "loadAnsiString", pykd::loadAnsiStr,
-        "Return string represention of windows ANSI_STRING type" );
+        "Return string representation of windows ANSI_STRING type" );
     python::def( "loadFloats", pykd::loadFloats, loadFloats_( python::args( "offset", "count", "phyAddr" ),
         "Read the block of the target's memory and return it as list of floats" ) );
     python::def( "loadDoubles", pykd::loadDoubles, loadDoubles_( python::args( "offset", "count", "phyAddr" ),
@@ -386,7 +411,7 @@ void pykd_init()
     python::def( "setPtr", pykd::setPtr,
         "Write an pointer value to the target memory" );
 
-    // types and vaiables
+    // types and variables
     python::def( "getSourceFile", pykd::getSourceFile, getSourceFile_( python::args( "offset"),
         "Return source file by the specified offset" ) );
     python::def("getSourceFileFromSrcSrv", pykd::getSourceFileFromSrcSrv, getSourceFileFromSrcSrv_(python::args("offset"),
@@ -395,7 +420,7 @@ void pykd_init()
         "Return source file name, line and displacement by the specified offset" ) );
 
     python::def( "getOffset", pykd::getSymbolOffset,
-        "Return traget virtual address for specified symbol" );
+        "Return target virtual address for specified symbol" );
     python::def( "findSymbol", pykd::findSymbol, findSymbol_( python::args( "offset", "showDisplacement"),
         "Find symbol by the target virtual memory offset" ) );
     python::def("findSymbolAndDisp", pykd::findSymbolAndDisp,
@@ -432,10 +457,15 @@ void pykd_init()
         "Create typeInfo provider from C/C++ source code") );
     python::def( "getTypeInfoProviderFromPdb", &pykd::getTypeInfoProviderFromPdb, getTypeInfoProviderFromPdb_( python::args("filePath", "baseOffset"),
         "Create typeInfo provider from pdb file") );
+    python::def("getSymbolProviderFromSource", &pykd::getSymbolProviderFromSource, getSymbolProviderFromSource_(python::args("sourceCode", "compileOptions"),
+        "Create symbol provider for source code"));
+    python::def("evalExpr", &pykd::evalExpr, evalExpr_(python::args("expression", "scope", "typeProvider"),
+        "Evaluate C++ expression with typed information"));
+
 
     // CPU registers
     python::def( "reg", pykd::getRegisterByName,
-        "Return a CPU regsiter value by the register's name" );
+        "Return a CPU register value by the register's name" );
     python::def( "reg", pykd::getRegisterByIndex,
         "Return a CPU register value by the register's number");
     python::def( "setReg", pykd::setRegisterByName,
@@ -472,8 +502,8 @@ void pykd_init()
         "Switch processor mode ( X86 <-> X64 )" );
 
    // stack and local variables
-    python::def( "getStack", pykd::getCurrentStack,
+    python::def( "getStack", pykd::getStack, getStack_(python::args("inlineFrames"),
-        "Return a current stack as a list of stackFrame objects" );
+        "Return a current stack as a list of stackFrame objects" ) );
     python::def( "getFrame", pykd::getCurrentFrame,
         "Return a current stack frame" );
     python::def("getFrameNumber", pykd::getCurrentFrameNumber,
@@ -503,7 +533,7 @@ void pykd_init()
 
     // breakpoints
     python::def( "setBp", &Breakpoint::setSoftwareBreakpoint,
-        setSoftwareBreakpoint_( python::args( "offset", "callback" ),"Set software breakpoint on executiont" )[python::return_value_policy<python::manage_new_object>()]);
+        setSoftwareBreakpoint_( python::args( "offset", "callback" ),"Set software breakpoint on execution" )[python::return_value_policy<python::manage_new_object>()]);
     python::def( "setBp", &Breakpoint::setHardwareBreakpoint, 
         setHardwareBreakpoint_( python::args( "offset", "size", "accsessType", "callback" ),"Set hardware breakpoint")[python::return_value_policy<python::manage_new_object>()]);
     python::def("getNumberBreakpoints", &Breakpoint::getNumberBreakpoints,
@@ -554,7 +584,7 @@ void pykd_init()
     python::def( "getThreadSystemID", pykd::getThreadSystemId, getThreadSystemId_( python::args("Id"),
         "Return system thread ID ( TID )" ) );
     python::def( "getThreadIdByOffset", pykd::getThreadIdByOffset,
-        "Return thread ID by the location in the targ et's memory of the thread structure" );
+        "Return thread ID by the location in the target's memory of the thread structure" );
     python::def( "getThreadIdBySystemID", pykd::getThreadIdBySystemId, getThreadIdBySystemId_( python::args("Tid"),
         "Return thread ID by the system's thread ID ( TID )" ) );
     python::def( "getCurrentThread", pykd::getCurrentThread,
@@ -595,13 +625,18 @@ void pykd_init()
     python::def("appendSrcPath", pykd::appendSrcPath,
         "Append current source path");
 
-
     // synthetic symbol
     python::def("addSyntheticSymbol", pykd::addSyntheticSymbol,
         "The addSyntheticSymbol function adds a synthetic symbol to a module in the current process\n"
         "Note: reloading the symbols for the module deletes all synthetic symbols associated with that module.");
     python::def( "removeSyntheticSymbol", pykd::removeSyntheticSymbol,
-        "The removeSyntheticSymbol function removes a synthetic symbol from a module in the current proces" );
+        "The removeSyntheticSymbol function removes a synthetic symbol from a module in the current process" );
+
+    // synthetic module
+    python::def("addSyntheticModule", pykd::addSyntheticModule, addSyntheticModule_(python::args("base", "size", "name", "path"),
+        "The addSyntheticModule function adds a synthetic module to the module list the debugger maintains for the current process"));
+    python::def("removeSyntheticModule", pykd::removeSyntheticModule,
+        "The removeSyntheticModule function removes a synthetic module from the module list the debugger maintains for the current process");
 
     // secondary callback data
     python::def("enumTagged", pykd::enumTagged,
@@ -679,7 +714,7 @@ void pykd_init()
         .def("isDumpAnalyzing", TargetSystemAdapter::isDumpAnalyzing,
             "Check if it is a dump analyzing ( not living debuggee )")
         .def("isKernelDebugging", TargetSystemAdapter::isKernelDebugging,
-            "Check if kernel dubugging is running")
+            "Check if kernel debugging is running")
         .def("is64bitSystem", TargetSystemAdapter::is64bitSystem,
             "Check if 64 bit system running" )
         .def("isCurrent", TargetSystemAdapter::isCurrent,
@@ -709,7 +744,7 @@ void pykd_init()
         .def("getProcessById", TargetProcessAdapter::getProcessById,
             "Return process by id").staticmethod("getProcessById")
         .add_property("systemID", TargetProcessAdapter::getSystemId,
-            "Retrun system process ID ( PID )" )
+            "Return system process ID ( PID )" )
         .add_property("id", TargetProcessAdapter::getId,
             "Return process id")
         .add_property("peb", TargetProcessAdapter::getPebOffset,
@@ -719,7 +754,7 @@ void pykd_init()
         .def("isCurrent", TargetProcessAdapter::isCurrent,
             "Check if the target is current")
         .def("isManaged", TargetProcessAdapter::isManaged,
-            "Check if the taget process is managed")
+            "Check if the target process is managed")
         .def("getNumberThreads", TargetProcessAdapter::getNumberThreads,
             "Return number of threads for this process" )
         .def("getThread", TargetProcessAdapter::getThreadByIndex,
@@ -769,7 +804,7 @@ void pykd_init()
         .add_property("id", TargetThreadAdapter::getId,
             "Return thread's id")
         .add_property("systemID", TargetThreadAdapter::getSystemId,
-            "Retrun system thread ID ( TID )" )
+            "Return system thread ID ( TID )" )
         .add_property("teb", TargetThreadAdapter::getTebOffset,
             "Return TEB address" )
         .add_property( "ip", TargetThreadAdapter::getIP, 
@@ -789,7 +824,7 @@ void pykd_init()
         .def("isCurrent", TargetThreadAdapter::isCurrent,
             "Check if this thread is current")
         .def("stack", TargetThreadAdapter::getStack,
-            "Get thread's stack tarce")
+            "Get thread's stack trace")
         .def("__str__", TargetThreadAdapter::print)
         ;
 
@@ -870,44 +905,63 @@ void pykd_init()
             "Return tuple of the module's file version")
         .def("getFixedFileInfo", ModuleAdapter::getFixedFileInfo,
             "Return FixedFileInfo" )
-        .def("__getattr__", ModuleAdapter::getSymbolVaAttr,
+        .def("hasSymbol", ModuleAdapter::isContainedSymbol,
-            "Return address of the symbol" )
+            "Check if a module has the specified symbol")
+        .def("__getattr__", ModuleAdapter::getAttrByName,
+            "Return symbol offset or type as attribute" )
+        .def("__getitem__", ModuleAdapter::getItemByKey,
+            "Return symbol offset or type as item" )
+        .def("__contains__", ModuleAdapter::isContainedSymbol)
         .def( "__str__", &ModuleAdapter::print );
 
-    python::class_<kdlib::TypeInfo, kdlib::TypeInfoPtr, python::bases<kdlib::NumConvertable>, boost::noncopyable >("typeInfo", "Class representing typeInfo", python::no_init )
+    python::class_<kdlib::TypeInfo, kdlib::TypeInfoPtr, python::bases<kdlib::NumConvertable>, boost::noncopyable >("typeInfo", "Class representing typeInfo", python::no_init)
-        .def("__init__", python::make_constructor( pykd::getTypeInfoByName ) )
+        .def("__init__", python::make_constructor(pykd::getTypeInfoByName))
-        .def( "name", TypeInfoAdapter::getName,
+        .def("name", TypeInfoAdapter::getName,
-            "Return type name" )
+            "Return type name")
         .def("scopeName", TypeInfoAdapter::getScopeName,
-            "Return name of type scope ( module name )" )
+            "Return name of type scope ( module name )")
-        .def( "size", TypeInfoAdapter::getSize,
+        .def("size", TypeInfoAdapter::getSize,
-            "Return type size" )
+            "Return type size")
-        .def( "staticOffset", TypeInfoAdapter::getStaticOffset,
+        .def("staticOffset", TypeInfoAdapter::getStaticOffset,
-            "Return offset of the static field" )
+            "Return offset of the static field")
-        .def( "fieldOffset", TypeInfoAdapter::getElementOffset,
+        .def("fieldOffset", TypeInfoAdapter::getElementOffset,
-            "Return offset of the nonstatic field" )
+            "Return offset of the nonstatic field")
         .def("fieldOffset", TypeInfoAdapter::getElementOffsetByIndex,
             "Return offset of the nonstatic field by index")
-        .def( "bitOffset", TypeInfoAdapter::getBitOffset,
+        .def("isStaticField", TypeInfoAdapter::isStaticField,
-            "Return bit field's offset" )
+            "Return True if a field is a static field by field name")
-        .def( "bitWidth", TypeInfoAdapter::getBitWidth,
+        .def("isStaticField", TypeInfoAdapter::isStaticFieldByIndex,
-            "Return bit field's length" )
+            "Return True if a field is a static field by field index")
-        .def( "getNumberFields", TypeInfoAdapter::getElementCount,
+        .def("isConstField", TypeInfoAdapter::isConstField,
-            "Return number of fields" )
+            "Return True if a field is a const field by field name")
-        .def( "field", TypeInfoAdapter::getElementByIndex,
+        .def("isConstField", TypeInfoAdapter::isConstFieldByIndex,
-            "Return field's type by index" )
+            "Return True if a field is a const field by field index")
-        .def( "field", TypeInfoAdapter::getElementByName,
+        .def("bitOffset", TypeInfoAdapter::getBitOffset,
-            "Return field's type" )
+            "Return bit field's offset")
+        .def("bitWidth", TypeInfoAdapter::getBitWidth,
+            "Return bit field's length")
+        .def("getNumberFields", TypeInfoAdapter::getElementCount,
+            "Return number of fields")
+        .def("field", TypeInfoAdapter::getElementByIndex,
+            "Return field's type by index")
+        .def("field", TypeInfoAdapter::getElementByName,
+            "Return field's type")
+        .def("hasField", TypeInfoAdapter::hasField,
+            "Return True if type has a field with the specified name")
         .def( "fieldName", TypeInfoAdapter::getElementName,
             "Return name of struct field by index" )
         .def( "fields", TypeInfoAdapter::getFields,
             "Return list of tuple ( filedName, fieldType )" )
+        .def( "members", TypeInfoAdapter::getMembers,
+            "Return list of tuple ( memberName, fieldType ). Only defined member, not inherited from base class")
         .def( "getNumberMethods", TypeInfoAdapter::getMethodsCount,
             "Return number of methods" )
         .def( "method", TypeInfoAdapter::getMethodByName,
             "Return method's type by name")
         .def( "method", TypeInfoAdapter::getMethodByIndex,
             "Return method's by index")
+        .def( "hasMethod", TypeInfoAdapter::hasMethod,
+            "Return True if type has a method with the specified name")
         .def( "methodName", TypeInfoAdapter::getMethodName,
             "Return method's name")
         .def( "methods", TypeInfoAdapter::getMethods,
@@ -924,6 +978,8 @@ void pykd_init()
             "Return a base class offset by index")
         .def("baseClasses", TypeInfoAdapter::getBaseClasses,
             "Return list of tuples ( baseClassName, baseClassOffset, baseClassType)")
+        .def( "getTemplateArgs", TypeInfoAdapter::getTemplateArgs,
+            "Return list if template arguments" )
         .def( "deref", TypeInfoAdapter::deref,
             "Return type of pointer" )
         .def( "append", TypeInfoAdapter::appendField,
@@ -954,6 +1010,8 @@ void pykd_init()
             "Return true if no type is specified" )
         .def( "isNoType", TypeInfoAdapter::isNoType,
             "Return true if type is virtual table" )
+        .def( "isTemplate", TypeInfoAdapter::isTemplate,
+            "Return true if type is template" )
         .def( "getCallingConvention", TypeInfoAdapter::getCallingConvention,
             "Returns an indicator of a methods calling convention: callingConvention" )
         .def( "getClassParent", TypeInfoAdapter::getClassParent,
@@ -967,8 +1025,9 @@ void pykd_init()
         .def( "__getitem__", TypeInfoAdapter::getElementByIndex )
         .def( "__getitem__", TypeInfoAdapter::getElementByKey )
         .def( "__dir__", TypeInfoAdapter::getElementDir )
+        .def("__contains__", TypeInfoAdapter::hasFieldOrMethod)
 #if PY_VERSION_HEX >= 0x03000000
-        .def("__bool__", TypeInfoAdapter::isZero )
+        .def("__bool__", TypeInfoAdapter::isNotZero )
 #else
         .def("__iszero__", TypeInfoAdapter::isZero )
 #endif
@@ -990,7 +1049,7 @@ void pykd_init()
         .def("__init__", python::make_constructor(pykd::getTypedVarByTypeInfo) )
         .def("__init__", python::make_constructor(pykd::getTypedVarWithPrototype) )
         .def("getLocation", TypedVarAdapter::getLocation,
-            "Return location of the varibale")
+            "Return location of the variable")
         .def("getAddress", TypedVarAdapter::getAddress, 
             "Return virtual address" )
         .def("getDebugStart", TypedVarAdapter::getDebugStart, 
@@ -1010,13 +1069,19 @@ void pykd_init()
         .def("setField", TypedVarAdapter::setField,
             "Set field of structure")
         .def("setField", TypedVarAdapter::setElementByIndex,
-            "Set field of a structire or an element od array")
+            "Set field of a stricture or an element of array")
+        .def("hasField", TypedVarAdapter::hasField,
+            "Check if a typedVar object has the specified field")
         .def( "fields", TypedVarAdapter::getFields,
             "Return list of tuple ( filedName, fieldOffset, fieldValue )" )
+        .def ("members", TypedVarAdapter::getMembers,
+            "Return list of tuple ( filedName, fieldOffset, fieldValue )")
         .def( "fieldName", TypedVarAdapter::getElementName,
             "Return name of struct field by index" )
         .def("method", TypedVarAdapter::getMethodByName, ( python::arg("name"), python::arg("prototype") = "" ),
             "Return method of class as an object attribute" )
+        .def("hasMethod", TypedVarAdapter::hasMethod,
+            "Check if a typedVar object has the specified method")
         .def("deref",TypedVarAdapter::deref,
             "Return value by pointer" )
         .def("rawBytes", TypedVarAdapter::getRawBytes,
@@ -1040,7 +1105,7 @@ void pykd_init()
         .def("__dir__", TypedVarAdapter::getElementsDir)
         .def("__call__", python::raw_function(pykd::callFunctionByVar, 0) )
         .def("__iter__", TypedVarAdapter::getArrayIter, python::return_value_policy<python::manage_new_object>())
-        //.def("__getitem__", &kdlib::TypedVar::getElementByIndexPtr )
+        .def("__contains__", TypedVarAdapter::hasField)
 #if PY_VERSION_HEX >= 0x03000000
         .def("__bool__", TypedVarAdapter::isNotZero)
 #else
@@ -1086,19 +1151,25 @@ void pykd_init()
         .add_property( "stackOffset", StackFrameAdapter::getSP,
             "Return a frame's stack offset" )
         .def( "getParams", StackFrameAdapter::getParamsList, 
-            "return set of function's parameters  as a  list of tuple (name, value ) ")
+            "return set of function's parameters as a list of tuple (name, value)")
         .add_property( "params", StackFrameAdapter::getParamsDict,
             "return set of function's parameters as a dict (name : value)")
         .def( "getParam", StackFrameAdapter::getParam,
             "return function param by it's name")
         .def( "getLocals", StackFrameAdapter::getLocalsList,
-            "return set of function's local variables  as a  list of tuple (name, value ) ")
+            "return set of function's local variables as a list of tuple (name, value)")
         .add_property("locals", StackFrameAdapter::getLocalsDict,
-            "return a set of  function's local variables as a dict ( name : value)")
+            "return a set of function's local variables as a dict (name : value)")
         .def( "getLocal", StackFrameAdapter::getLocal,
             "return the function's local variable by it's name")
         .def( "switchTo", StackFrameAdapter::switchTo,
             "Make this frame a current")
+        .def( "isInline", StackFrameAdapter::isInline,
+            "this virtual frame of inlined function" )
+        .def( "findSymbol", StackFrameAdapter::findSymbol,
+            "return symbol for frame's instruction pointer")
+        .def( "getSourceLine", StackFrameAdapter::getSourceLine,
+            "return source line for stack frame's function" )
         .def( "__str__", StackFrameAdapter::print );
 
     python::class_<CPUContextAdapter>("cpu", "class for CPU context representation" )
@@ -1204,7 +1275,7 @@ void pykd_init()
         .value("ChangeSymbolState", kdlib::EventTypeChangeSymbolState)
         ;
 
-    python::class_<pykd::DebugEvent>("debugEvent", "Debug evemt descriptions", python::no_init)
+    python::class_<pykd::DebugEvent>("debugEvent", "Debug event descriptions", python::no_init)
         .def_readonly("type", &DebugEvent::eventType)
         .def_readonly("process", &DebugEvent::process)
         .def_readonly("thread", &DebugEvent::thread)
@@ -1218,7 +1289,7 @@ void pykd_init()
         .def( "disasm", DisasmAdapter::jump, 
             "Disassemble from the specified offset" )
         .def( "asm", DisasmAdapter::assembly,
-            "Insert assemblied instuction to current offset" )
+            "Insert assembled instruction to current offset" )
         .def( "begin", DisasmAdapter::begin,
             "Return begin offset" )
         .def( "current", DisasmAdapter::current, 
@@ -1253,9 +1324,8 @@ void pykd_init()
 #endif
         ;
 
-
     python::class_<kdlib::TypeInfoProvider, kdlib::TypeInfoProviderPtr, boost::noncopyable>("typeInfoProvider",
-        "Get abstaract access to different type info sources", python::no_init)
+        "Get abstract access to different type info sources", python::no_init)
         .def( "getTypeByName", TypeInfoProviderAdapter::getTypeByName,
             "Get type info by it's name" )
         .def( "typeIterator", TypeInfoProviderAdapter::getTypeIterWithMask, python::return_value_policy<python::manage_new_object>(),
@@ -1264,6 +1334,22 @@ void pykd_init()
         .def( "__getattr__", TypeInfoProviderAdapter::getTypeAsAttr )
          ;
 
+    python::class_<SymbolEnumeratorAdapter>("symbolIterator", "Iterator for symbols", python::no_init)
+        .def("__iter__", SymbolEnumeratorAdapter::getIter)
+#if PY_VERSION_HEX < 0x03000000
+        .def("next", &SymbolEnumeratorAdapter::next)
+#else
+        .def("__next__", &SymbolEnumeratorAdapter::next)
+#endif
+        ;
+
+    python::class_<kdlib::SymbolProvider, kdlib::SymbolProviderPtr, boost::noncopyable>("symbolProvider",
+        "Get abstract access to different type info sources", python::no_init)
+        .def("iter", SymbolProviderAdapter::getIterWithMask, python::return_value_policy<python::manage_new_object>(),
+            "Return type iterator with specified mask")
+        .def("__iter__", SymbolProviderAdapter::getIter, python::return_value_policy<python::manage_new_object>())
+        ;
+
     python::enum_<kdlib::DebugCallbackResult>("eventResult", "Return value of event handler")
         .value("Proceed", kdlib::DebugCallbackProceed)
         .value("NoChange", kdlib::DebugCallbackNoChange)
@@ -1311,12 +1397,12 @@ void pykd_init()
         .value("ARM", kdlib::CPU_ARM )
         ;
 
-    python::enum_<kdlib::VarStorage>("Location", "Location of a varibale")
+    python::enum_<kdlib::VarStorage>("Location", "Location of a variable")
         .value("Reg", kdlib::RegisterVar)
         .value("Memory", kdlib::MemoryVar)
         ;
 
-    python::enum_<kdlib::MemoryProtect>("memoryProtect", "Memory protection attribiuties")
+    python::enum_<kdlib::MemoryProtect>("memoryProtect", "Memory protection attributes")
         .value("PageNoAccess", kdlib::PageNoAccess)
         .value("PageReadOnly", kdlib::PageReadOnly)
         .value("PageReadWrite", kdlib::PageReadWrite)
@@ -1327,12 +1413,24 @@ void pykd_init()
         .value("PageExecuteWriteCopy", kdlib::PageExecuteWriteCopy)
         ;
 
+    python::enum_<kdlib::MemoryState>("memoryState", "Memory state")
+        .value("Commit", kdlib::MemCommit)
+        .value("Reserve", kdlib::MemReserve)
+        .value("Free", kdlib::MemFree)
+        ;
+
+    python::enum_<kdlib::MemoryType>("memoryType", "Memory type")
+        .value("Mapped", kdlib::MemMapped)
+        .value("Image", kdlib::MemImage)
+        .value("Private", kdlib::MemPrivate)
+        ;
+
     python::enum_<kdlib::ProcessDebugOptions>("ProcessDebugOptions", "Process debug option")
         .value("BreakOnStart", kdlib::ProcessBreakOnStart)
         .value("BreakOnStop", kdlib::ProcessBreakOnStop)
         .value("DebugChildren", kdlib::ProcessDebugChildren)
         .value("NoDebugHeap", kdlib::ProcessNoDebugHeap)
-        .value("Deafult", kdlib::ProcessDebugDefault)
+        .value("Default", kdlib::ProcessDebugDefault)
         ;
 
     python::class_<EventHandler, boost::noncopyable>(
@@ -1423,6 +1521,54 @@ void pykd_init()
         .value("Execute", kdlib::Execute)
         ;
 
+    python::enum_<kdlib::OutputFlag>("outputFlag", "Set of output mask")
+        .value("Normal", kdlib::Normal)
+        .value("Error", kdlib::Error)
+        .value("Warning", kdlib::Warning)
+        .value("Verbose", kdlib::Verbose)
+        .value("Prompt", kdlib::Prompt)
+        .value("PromptRegister", kdlib::PromptRegister)
+        .value("ExtensionWarning", kdlib::ExtensionWarning)
+        .value("Debuggee", kdlib::Debuggee)
+        .value("DebuggeePrompt", kdlib::DebuggeePrompt)
+        .value("Symbols", kdlib::Symbols)
+        .value("Status", kdlib::Status)
+        .value("All", kdlib::All)
+        ;
+
+    python::enum_<kdlib::DumpType>("dumpType", "Dump type")
+        .value("Small", kdlib::Small)
+        .value("Default", kdlib::Default)
+        .value("Full", kdlib::Full)
+        .value("Image", kdlib::Image)
+        .value("KernelSmall", kdlib::KernelSmall)
+        .value("Kernel", kdlib::Kernel)
+        .value("KernelFull", kdlib::KernelFull)
+        ;
+
+    python::enum_<kdlib::DumpFormat>("dumpFormat", "Dump format")
+        .value("UserSmallFullMemory", kdlib::UserSmallFullMemory)
+        .value("UserSmallHandleData", kdlib::UserSmallHandleData)
+        .value("UserSmallUnloadedModules", kdlib::UserSmallUnloadedModules)
+        .value("UserSmallIndirectMemory", kdlib::UserSmallIndirectMemory)
+        .value("UserSmallDataSegments", kdlib::UserSmallDataSegments)
+        .value("UserSmallFilterMemory", kdlib::UserSmallFilterMemory)
+        .value("UserSmallFilterPaths", kdlib::UserSmallFilterPaths)
+        .value("UserSmallProcessThreadData", kdlib::UserSmallProcessThreadData)
+        .value("UserSmallPrivateReadWriteMemory", kdlib::UserSmallPrivateReadWriteMemory)
+        .value("UserSmallNoOptionalData", kdlib::UserSmallNoOptionalData)
+        .value("UserSmallFullMemoryInfo", kdlib::UserSmallFullMemoryInfo)
+        .value("UserSmallThreadInfo", kdlib::UserSmallThreadInfo)
+        .value("UserSmallCodeSegments", kdlib::UserSmallCodeSegments)
+        .value("UserSmallNoAuxiliaryState", kdlib::UserSmallNoAuxiliaryState)
+        .value("UserSmallFullAuxiliaryState", kdlib::UserSmallFullAuxiliaryState)
+        .value("UserSmallModuleHeaders", kdlib::UserSmallModuleHeaders)
+        .value("UserSmallFilterTriage", kdlib::UserSmallFilterTriage)
+        .value("UserSmallAddAvxXStateContext", kdlib::UserSmallAddAvxXStateContext)
+        .value("UserSmallIptTrace", kdlib::UserSmallIptTrace)
+        .value("UserSmallIgnoreInaccessibleMem", kdlib::UserSmallIgnoreInaccessibleMem)
+        ;
+
     // C++ exception translation to python
     pykd::registerExceptions();
 }

pykd/pymodule.cpp

@@ -1,6 +1,8 @@
 #include "stdafx.h"
 
 #include "pymodule.h"
+#include <iomanip>
+#include <ctime>
 
 namespace pykd {
 
@@ -48,20 +50,8 @@ std::wstring ModuleAdapter::print( kdlib::Module& module )
     sstr << L"Image: " <<  module.getImageName() << std::endl;
     sstr << L"Symbols: " << module.getSymFile() << std::endl;
 
-
+    time_t  timeStamp = module.getTimeDataStamp();
-    //if ( m_symSession )
+    sstr << L"Timestamp: " << timeStamp << " (" << std::put_time(std::gmtime(&timeStamp), L"%c") << L')' << std::endl;
-    //{
-    //     sstr << "Symbols: " << m_symSession->getSymbolFileName() << std::endl;
-    //    std::string buildDesc = m_symSession->getBuildDescription();
-    //    if (!buildDesc.empty())
-    //        sstr << "\t" << buildDesc << std::endl;
-    //}
-    //else
-    //{
-    //     sstr << "Symbols: not found" << std::endl;
-    //}
- 
-    sstr << L"Timestamp: " << module.getTimeDataStamp() << std::endl;
     sstr << L"Check Sum: " << module.getCheckSum() << std::endl;
 
     return sstr.str();
@@ -103,6 +93,15 @@ python::list  ModuleAdapter::enumTypes(kdlib::Module& module, const std::wstring
 
 ///////////////////////////////////////////////////////////////////////////////
 
+bool ModuleAdapter::isContainedSymbol(kdlib::ModulePtr& module, const std::wstring& symbolName)
+{
+    if (!module->enumSymbols(symbolName).empty())
+        return true;
+
+    return !module->enumTypes(symbolName).empty();
+}
+
+///////////////////////////////////////////////////////////////////////////////
 
 std::wstring ModuleAdapter::findSymbol( kdlib::Module& module, kdlib::MEMOFFSET_64 offset, bool showDisplacement ) 
 {

pykd/pymodule.h

@@ -82,20 +82,51 @@ struct ModuleAdapter : public kdlib::Module
         return module.getSymbolVa(symbolName);
     }
 
-    static kdlib::MEMOFFSET_64 getSymbolVaAttr(kdlib::Module& module, const std::wstring &symbolName)
+    static python::object getAttrByName(kdlib::Module& module, const std::wstring &symbolName)
     {
         AutoRestorePyState  pystate;
         try {
-            return module.getSymbolVa(symbolName);
+            return python::object(module.getSymbolVa(symbolName));
+        }
+        catch (kdlib::DbgException&)
+        { }
+
+
+        try {
+            return python::object(module.getTypeByName(symbolName));
+        }
+        catch (kdlib::DbgException&)
+        { }
+
+        std::wstringstream sstr;
+        sstr << L'\'' << module.getName() << L'\'' << L" module has not a symbol " << L'\'' << symbolName << L'\'';
+        throw AttributeException(std::string(_bstr_t(sstr.str().c_str())).c_str());
+    }
+
+    static python::object getItemByKey(kdlib::Module& module, const std::wstring &symbolName)
+    {
+        AutoRestorePyState  pystate;
+
+        try {
+            return python::object(module.getSymbolVa(symbolName));
         }
         catch (kdlib::DbgException&)
         {
+        }
+
+        try {
+            return python::object(module.getTypeByName(symbolName));
+        }
+        catch (kdlib::DbgException&)
+        {
+        }
+
         std::wstringstream sstr;
-            sstr << L'\'' << module.getName() << L'\'' << L" module has no symbol " << L'\'' << symbolName << L'\'';
+        sstr << L"module has not a symbol " << L'\'' << symbolName << L'\'';
-            throw AttributeException(std::string(_bstr_t(sstr.str().c_str())).c_str());
+        throw KeyException(std::string(_bstr_t(sstr.str().c_str())).c_str());
-        }
     }
     
+
     static kdlib::MEMOFFSET_32 getSymbolRva( kdlib::Module& module, const std::wstring &symbolName )
     {
         AutoRestorePyState  pystate;
@@ -198,6 +229,7 @@ struct ModuleAdapter : public kdlib::Module
 
     static python::list getTypedVarArrayByTypeName( kdlib::Module& module, kdlib::MEMOFFSET_64 offset, const std::wstring &typeName, size_t number );
 
+    static bool isContainedSymbol(kdlib::ModulePtr& module, const std::wstring& symbolName);
 };
 
 } // end namespace pykd

pykd/pytypedvar.cpp

@@ -103,7 +103,7 @@ python::list getTypedVarArrayByType( kdlib::MEMOFFSET_64 offset, kdlib::TypeInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-python::list TypedVarAdapter::getFields( kdlib::TypedVar& typedVar )
+python::list TypedVarAdapter::getFields(const kdlib::TypedVarPtr& typedVar)
 {
     typedef boost::tuple<std::wstring,kdlib::MEMOFFSET_32,kdlib::TypedVarPtr> FieldTuple;
 
@@ -113,15 +113,18 @@ python::list TypedVarAdapter::getFields( kdlib::TypedVar& typedVar )
 
         AutoRestorePyState  pystate;
 
-        for ( size_t i = 0; i < typedVar.getElementCount(); ++i )
+        for ( size_t i = 0; i < typedVar->getElementCount(); ++i )
         {
-            std::wstring  name = typedVar.getElementName(i);
+            std::wstring  name = typedVar->getElementName(i);
             kdlib::MEMOFFSET_32  offset = 0;
 
-            if (!typedVar.getType()->isStaticMember(i) )
+            if (typedVar->getType()->isConstMember(i))
-                offset = typedVar.getElementOffset(i);
+                continue;
 
-            kdlib::TypedVarPtr  val = typedVar.getElement(i);
+            if (!typedVar->getType()->isStaticMember(i) )
+                offset = typedVar->getElementOffset(i);
+
+            kdlib::TypedVarPtr  val = typedVar->getElement(i);
 
             lst.push_back( FieldTuple( name, offset, val ) );
         }
@@ -136,6 +139,77 @@ python::list TypedVarAdapter::getFields( kdlib::TypedVar& typedVar )
     return pylst;
 }
 
+python::list TypedVarAdapter::getMembers(const kdlib::TypedVarPtr& typedVar)
+{
+    typedef boost::tuple<std::wstring, kdlib::MEMOFFSET_32, kdlib::TypedVarPtr> FieldTuple;
+
+    std::list<FieldTuple>  lst;
+
+    do {
+
+        AutoRestorePyState  pystate;
+
+        auto varType = typedVar->getType();
+
+        for (size_t i = 0; i < typedVar->getElementCount(); ++i)
+        {
+            if (varType->isConstMember(i) || varType->isInheritedMember(i))
+                continue;                     
+
+            std::wstring  name = typedVar->getElementName(i);
+            kdlib::MEMOFFSET_32  offset = 0;
+
+            if (!varType->isStaticMember(i))
+                offset = typedVar->getElementOffset(i);
+
+            kdlib::TypedVarPtr  val = typedVar->getElement(i);
+
+            lst.push_back(FieldTuple(name, offset, val));
+        }
+
+    } while (false);
+
+    python::list pylst;
+
+    for (std::list<FieldTuple>::const_iterator it = lst.begin(); it != lst.end(); ++it)
+        pylst.append(python::make_tuple(it->get<0>(), it->get<1>(), it->get<2>()));
+
+    return pylst;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool TypedVarAdapter::hasField(kdlib::TypedVarPtr& typedVar, const std::wstring &fieldName)
+{
+    AutoRestorePyState  pystate;
+
+    for (size_t i = 0; i < typedVar->getElementCount(); ++i)
+    {
+        std::wstring  name = typedVar->getElementName(i);
+        if (name == fieldName)
+            return true;
+    }
+
+    return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool TypedVarAdapter::hasMethod(kdlib::TypedVarPtr& typedVar, const std::wstring &name)
+{
+    AutoRestorePyState  pystate;
+
+    try {
+        typedVar->getMethod(name);
+        return true;
+    }
+    catch (kdlib::DbgException&)
+    {
+    }
+
+    return false;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 python::list TypedVarAdapter::getElementsDir(kdlib::TypedVar& typedVar)
@@ -168,7 +242,8 @@ python::list TypedVarAdapter::getElementsDir(kdlib::TypedVar& typedVar)
 
 kdlib::TypedVarPtr TypedVarAdapter::getFieldAttr(kdlib::TypedVar& typedVar, const std::wstring &name)
 {
-    {
+    if (name == L"__name__")
+        throw AttributeException("no __name__ attribute");
 
     AutoRestorePyState  pystate;
 
@@ -179,19 +254,20 @@ kdlib::TypedVarPtr TypedVarAdapter::getFieldAttr(kdlib::TypedVar& typedVar, cons
     catch (kdlib::TypeException&)
     {}
 
+
     try
     {
-            return typedVar.getMethod( name );
+        return typedVar.getMethod(name);
     }
     catch (kdlib::TypeException&)
-        {}
+    {
     }
 
-    std::wstringstream sstr;
-    sstr << L"typed var has no field " << L'\'' << name << L'\'';
-    throw AttributeException(std::string(_bstr_t(sstr.str().c_str())).c_str());
-}
 
+    std::stringstream sstr;
+    sstr << "typed var has no field " << '\'' << _bstr_t(name.c_str()) << '\'';
+    throw AttributeException(sstr.str().c_str());
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -261,7 +337,6 @@ void TypedVarAdapter::setFieldAttr(kdlib::TypedVar& typedVar, const std::wstring
 kdlib::TypedVarPtr TypedVarAdapter::getFieldByKey(kdlib::TypedVar& typedVar, const std::wstring &name)
 {
     {
-
         AutoRestorePyState  pystate;
 
         try
@@ -306,5 +381,57 @@ void TypedVarAdapter::setFieldByKey(kdlib::TypedVar& typedVar, const std::wstrin
 
 ///////////////////////////////////////////////////////////////////////////////
 
+class PyScope : public kdlib::Scope
+{
+public:
+
+    kdlib::TypedValue get(const std::wstring& varName) const override
+    {
+        return getTypdedValueFromPyObj(m_scope[varName]);
+    }
+
+    virtual bool find(const std::wstring& varName, kdlib::TypedValue& value) const override
+    {
+        if (!m_scope.contains(varName))
+            return false;
+
+        value = getTypdedValueFromPyObj(m_scope[varName]);
+
+        return true;
+    }
+
+    PyScope(const python::object& scope) :
+        m_scope(scope)
+    {}
+
+private:
+
+    python::object  m_scope;
+};
+
+kdlib::TypedVarPtr evalExpr(const std::string  expression, python::object&  scope, kdlib::TypeInfoProviderPtr& typeInfoProvider )
+{
+    if (scope)
+    {
+        return kdlib::evalExpr(expression, kdlib::ScopePtr(new PyScope(scope)), typeInfoProvider).get();
+    }
+
+    return kdlib::evalExpr(expression).get();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+kdlib::TypedValue  getTypdedValueFromPyObj(const python::object& value)
+{
+    python::extract<kdlib::TypedVarPtr>  getTypedVar(value);
+    if (getTypedVar.check())
+        return getTypedVar();
+
+    return NumVariantAdaptor::convertToVariant(value);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+
 } // namespace pykd
 

pykd/pytypedvar.h

@@ -7,6 +7,7 @@
 namespace python = boost::python;
 
 #include "kdlib/typedvar.h"
+#include "kdlib/typeinfo.h"
 
 #include "stladaptor.h"
 #include "pythreadstate.h"
@@ -142,6 +143,10 @@ struct TypedVarAdapter {
     
     static void setField(kdlib::TypedVar& typedVar, const std::wstring &name, python::object&  object);
 
+    static bool hasField(kdlib::TypedVarPtr& typedVar, const std::wstring &name);
+
+    static bool hasMethod(kdlib::TypedVarPtr& typedVar, const std::wstring &name);
+
     static kdlib::TypedVarPtr getFieldAttr(kdlib::TypedVar& typedVar, const std::wstring &name);
     
     static void setFieldAttr(kdlib::TypedVar& typedVar, const std::wstring &name, python::object&  object);
@@ -182,7 +187,9 @@ struct TypedVarAdapter {
         return typedVar.str();
     }
 
-    static python::list getFields( kdlib::TypedVar& typedVar );
+    static python::list getFields(const kdlib::TypedVarPtr& typedVar);
+
+    static python::list getMembers(const kdlib::TypedVarPtr& typedVar);
 
     static kdlib::TypeInfoPtr getType( kdlib::TypedVar& typedVar )
     {
@@ -227,6 +234,12 @@ struct TypedVarAdapter {
     {
         return new TypedVarIterator(typedVar);
     }
+
 };
 
+kdlib::TypedValue  getTypdedValueFromPyObj(const python::object& value);
+
+kdlib::TypedVarPtr evalExpr(const std::string  expression, python::object&  scope = python::object(), kdlib::TypeInfoProviderPtr& typeInfoProvider = kdlib::getDefaultTypeInfoProvider());
+    
+
 } // end namespace pykd

pykd/pytypeinfo.cpp

@@ -75,7 +75,7 @@ python::tuple findSymbolAndDisp( ULONG64 offset )
 
 ///////////////////////////////////////////////////////////////////////////////
 
-python::list TypeInfoAdapter::getFields( kdlib::TypeInfo &typeInfo )
+python::list TypeInfoAdapter::getFields( const kdlib::TypeInfoPtr &typeInfo )
 {
     typedef boost::tuple<std::wstring,kdlib::TypeInfoPtr> FieldTuple;
 
@@ -85,10 +85,10 @@ python::list TypeInfoAdapter::getFields( kdlib::TypeInfo &typeInfo )
 
         AutoRestorePyState  pystate;
 
-        for ( size_t i = 0; i < typeInfo.getElementCount(); ++i )
+        for ( size_t i = 0; i < typeInfo->getElementCount(); ++i )
         {
-            std::wstring  name = typeInfo.getElementName(i);
+            std::wstring  name = typeInfo->getElementName(i);
-            kdlib::TypeInfoPtr  val = typeInfo.getElement(i);
+            kdlib::TypeInfoPtr  val = typeInfo->getElement(i);
 
             lst.push_back( FieldTuple( name, val ) );
         }
@@ -103,6 +103,84 @@ python::list TypeInfoAdapter::getFields( kdlib::TypeInfo &typeInfo )
     return pylst;
 }
 
+python::list TypeInfoAdapter::getMembers(const kdlib::TypeInfoPtr &typeInfo)
+{
+    typedef boost::tuple<std::wstring, kdlib::TypeInfoPtr> FieldTuple;
+
+    std::list<FieldTuple>  lst;
+
+    do {
+
+        AutoRestorePyState  pystate;
+
+        for (size_t i = 0; i < typeInfo->getElementCount(); ++i)
+        {
+            std::wstring  name = typeInfo->getElementName(i);
+            kdlib::TypeInfoPtr  val = typeInfo->getElement(i);
+
+            if (!typeInfo->isInheritedMember(i))
+                lst.push_back(FieldTuple(name, val));
+        }
+
+    } while (false);
+
+    python::list pylst;
+
+    for (std::list<FieldTuple>::const_iterator it = lst.begin(); it != lst.end(); ++it)
+        pylst.append(python::make_tuple(it->get<0>(), it->get<1>()));
+
+    return pylst;
+}
+
+bool TypeInfoAdapter::hasFieldOrMethod(kdlib::TypeInfoPtr& typeInfo, const std::wstring& fieldName)
+{
+    AutoRestorePyState  pystate;
+
+    for (size_t i = 0; i < typeInfo->getElementCount(); ++i)
+    {
+        std::wstring  name = typeInfo->getElementName(i);
+        if (name == fieldName)
+            return true;
+    }
+
+    for (size_t i = 0; i < typeInfo->getMethodsCount(); ++i)
+    {
+        std::wstring  name = typeInfo->getMethodName(i);
+        if (name == fieldName)
+            return true;
+    }
+
+    return false;
+}
+
+bool TypeInfoAdapter::hasField(kdlib::TypeInfoPtr &typeInfo, const std::wstring &fieldName)
+{
+    AutoRestorePyState  pystate;
+
+    for (size_t i = 0; i < typeInfo->getElementCount(); ++i)
+    {
+        std::wstring  name = typeInfo->getElementName(i);
+        if (name == fieldName)
+            return true;
+    }
+
+    return false;
+}
+
+bool TypeInfoAdapter::hasMethod(kdlib::TypeInfoPtr &typeInfo, const std::wstring &fieldName)
+{
+    AutoRestorePyState  pystate;
+
+    for (size_t i = 0; i < typeInfo->getMethodsCount(); ++i)
+    {
+        std::wstring  name = typeInfo->getMethodName(i);
+        if (name == fieldName)
+            return true;
+    }
+
+    return false;
+}
+
 python::list TypeInfoAdapter::getMethods(kdlib::TypeInfo &typeInfo)
 {
     typedef boost::tuple<std::wstring, kdlib::TypeInfoPtr> FieldTuple;
@@ -162,9 +240,31 @@ python::list TypeInfoAdapter::getBaseClasses(kdlib::TypeInfo &typeInfo)
 
 ///////////////////////////////////////////////////////////////////////////////
 
+python::list TypeInfoAdapter::getTemplateArgs(const kdlib::TypeInfoPtr &typeInfo)
+{
+    std::list<std::wstring>  templateArgs;
+
+    {
+        AutoRestorePyState  pystate;
+
+        for (size_t i = 0; i < typeInfo->getTemplateArgsCount(); ++i)
+        {
+            templateArgs.push_back(typeInfo->getTemplateArg(i));
+        }
+    }
+    
+    python::list pylst;
+
+    for (const auto& arg : templateArgs)
+        pylst.append(arg);
+
+    return pylst;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 kdlib::TypeInfoPtr TypeInfoAdapter::getElementAttr(kdlib::TypeInfo &typeInfo, const std::wstring &name)
 {
-    {
     AutoRestorePyState  pystate;
 
     try {
@@ -173,23 +273,26 @@ kdlib::TypeInfoPtr TypeInfoAdapter::getElementAttr(kdlib::TypeInfo &typeInfo, co
     catch (kdlib::TypeException&)
     {}
 
-        try {
+    try
+    {
         return typeInfo.getMethod(name);
     }
     catch (kdlib::TypeException&)
-        {}
+    {
     }
 
-    std::wstringstream sstr;
+    std::stringstream sstr;
-    sstr << L'\'' << typeInfo.getName() << L'\'' << L" type has no field " << L'\'' << name << L'\'';
+    sstr << '\'' << _bstr_t(typeInfo.getName().c_str()) << '\''
-    throw AttributeException(std::string(_bstr_t(sstr.str().c_str())).c_str());
+        << " type has no field " << '\'' << _bstr_t(name.c_str()) << '\'';
+    throw AttributeException(sstr.str().c_str());
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 kdlib::TypeInfoPtr TypeInfoAdapter::getElementByKey(kdlib::TypeInfo &typeInfo, const std::wstring &name)
 {
-    {
+
     AutoRestorePyState  pystate;
 
     try {
@@ -203,7 +306,7 @@ kdlib::TypeInfoPtr TypeInfoAdapter::getElementByKey(kdlib::TypeInfo &typeInfo, c
     }
     catch (kdlib::TypeException&)
     {}
-    }
+
 
     std::wstringstream sstr;
     sstr << L'\'' << typeInfo.getName() << L'\'' << L" type has no field " << L'\'' << name << L'\'';
@@ -291,7 +394,6 @@ python::object  callTypedVar(kdlib::TypedVarPtr& funcobj, python::tuple& args)
             continue;
         }
 
-
         if ( python::extract<int>(args[i]).check() )
         {
             kdlib::NumVariant  var= NumVariantAdaptor::convertToVariant(args[i]);

pykd/pytypeinfo.h

@@ -69,6 +69,12 @@ inline kdlib::TypeInfoProviderPtr getTypeInfoProviderFromSource(const std::wstri
     return kdlib::getTypeInfoProviderFromSource(sourceCode, compileOptions);
 }
 
+inline kdlib::SymbolProviderPtr getSymbolProviderFromSource(const std::wstring& sourceCode, const std::wstring& compileOptions = L"")
+{
+    AutoRestorePyState  pystate;
+    return kdlib::getSymbolProviderFromSource(sourceCode, compileOptions);
+}
+
 inline kdlib::TypeInfoProviderPtr getTypeInfoProviderFromPdb(const std::wstring&  fileName, kdlib::MEMOFFSET_64 offset = 0UL)
 {
     AutoRestorePyState  pystate;
@@ -143,6 +149,30 @@ struct TypeInfoAdapter : public kdlib::TypeInfo {
         return typeInfo.getElementVa( name );
     }
 
+    static bool isStaticField(const kdlib::TypeInfoPtr &typeInfo, const std::wstring &name)
+    {
+        AutoRestorePyState  pystate;
+        return typeInfo->isStaticMember(name);
+    }
+
+    static bool isStaticFieldByIndex(const kdlib::TypeInfoPtr &typeInfo, size_t index)
+    {
+        AutoRestorePyState  pystate;
+        return typeInfo->isStaticMember(index);
+    }
+
+
+    static bool isConstField(const kdlib::TypeInfoPtr &typeInfo, const std::wstring &name)
+    {
+        AutoRestorePyState  pystate;
+        return typeInfo->isConstMember(name);
+    }
+
+    static bool isConstFieldByIndex(const kdlib::TypeInfoPtr &typeInfo, size_t index)
+    {
+        AutoRestorePyState  pystate;
+        return typeInfo->isConstMember(index);
+    }
 
     static kdlib::TypeInfoPtr getElementByName( kdlib::TypeInfo &typeInfo, const std::wstring &name ) 
     {
@@ -150,6 +180,10 @@ struct TypeInfoAdapter : public kdlib::TypeInfo {
         return typeInfo.getElement(name);
     }
 
+    static bool hasField(kdlib::TypeInfoPtr &typeInfo, const std::wstring &name);
+
+    static bool hasMethod(kdlib::TypeInfoPtr &typeInfo, const std::wstring &fieldName);
+
     static kdlib::TypeInfoPtr getElementAttr(kdlib::TypeInfo &typeInfo, const std::wstring &name);
 
     static kdlib::TypeInfoPtr getElementByKey(kdlib::TypeInfo &typeInfo, const std::wstring &name);
@@ -298,6 +332,12 @@ struct TypeInfoAdapter : public kdlib::TypeInfo {
         return typeInfo.isNoType();
     }
 
+    static bool isTemplate(const kdlib::TypeInfoPtr &typeInfo)
+    {
+        AutoRestorePyState  pystate;
+        return typeInfo->isTemplate();
+    }
+
     static void appendField( kdlib::TypeInfo &typeInfo, const std::wstring &fieldName, kdlib::TypeInfoPtr &fieldType )
     {
         AutoRestorePyState  pystate;
@@ -322,7 +362,9 @@ struct TypeInfoAdapter : public kdlib::TypeInfo {
         return typeInfo.str();
     }
 
-    static python::list getFields( kdlib::TypeInfo &typeInfo );
+    static python::list getFields( const kdlib::TypeInfoPtr &typeInfo );
+
+    static python::list getMembers(const kdlib::TypeInfoPtr &typeInfo);
 
     static python::list getMethods(kdlib::TypeInfo &typeInfo);
 
@@ -330,10 +372,18 @@ struct TypeInfoAdapter : public kdlib::TypeInfo {
 
     static python::list getBaseClasses(kdlib::TypeInfo &typeInfo);
 
+    static python::list getTemplateArgs(const kdlib::TypeInfoPtr &typeInfo);
+
     static bool isZero(kdlib::TypeInfo &typeInfo) {
         return false;
     }
 
+    static bool isNotZero(kdlib::TypeInfo &typeInfo) {
+        return true;
+    }
+
+    static bool hasFieldOrMethod(kdlib::TypeInfoPtr& typedVar, const std::wstring& name);
+
 };
 
 
@@ -392,6 +442,56 @@ struct TypeInfoProviderAdapter : public kdlib::TypeInfoProvider
 
 };
 
+struct SymbolEnumeratorAdapter
+{
+    SymbolEnumeratorAdapter(const kdlib::SymbolEnumeratorPtr&  symEnum)
+        : m_symEnum(symEnum)
+    {}
+
+
+    static python::object getIter(const python::object& obj)
+    {
+        return obj;
+    }
+
+    python::tuple next()
+    {
+        std::wstring name;
+        kdlib::MEMOFFSET_64  offset;
+        kdlib::TypeInfoPtr  typeInfo;
+
+        {
+            AutoRestorePyState  pystate;
+
+             if (!m_symEnum->Next())
+                throw StopIteration("No more data.");
+
+             name = m_symEnum->getName();
+             offset = m_symEnum->getOffset();
+             typeInfo = m_symEnum->getType();
+        }
+
+        return python::make_tuple(name, offset, typeInfo);
+    }
+
+private:
+
+    kdlib::SymbolEnumeratorPtr  m_symEnum;
+};
+
+struct SymbolProviderAdapter
+{
+    static SymbolEnumeratorAdapter* getIter(const kdlib::SymbolProviderPtr &symProvider)
+    {
+        return new SymbolEnumeratorAdapter(symProvider->getSymbolEnumerator());
+    };
+
+    static SymbolEnumeratorAdapter* getIterWithMask(const kdlib::SymbolProviderPtr &symProvider, const std::wstring& mask)
+    {
+        return new SymbolEnumeratorAdapter(symProvider->getSymbolEnumerator(mask));
+    }
+};
+
 struct BaseTypesEnum {
     static kdlib::TypeInfoPtr getUInt1B() { return pykd::getTypeInfoByName(L"UInt1B"); }
     static kdlib::TypeInfoPtr getUInt2B() { return pykd::getTypeInfoByName(L"UInt2B");  }
@@ -411,9 +511,4 @@ struct BaseTypesEnum {
     static kdlib::TypeInfoPtr getDouble() { return pykd::getTypeInfoByName(L"Double"); }
 };
 
-
-
-
-
-
 } // end namespace pykd

pykd/variant.h

@@ -14,12 +14,12 @@ class NumVariantAdaptor : public kdlib::NumConvertable
 
 public:
 
-   static kdlib::NumVariant NumVariantAdaptor::convertToVariant( const python::object &obj)
+    static kdlib::NumVariant convertToVariant(const python::object &obj)
     {
         kdlib::NumVariant   var;
 
         python::extract<kdlib::NumConvertable>  getNumVar(obj);
-        if ( getNumVar.check() )
+        if (getNumVar.check())
         {
             var = getNumVar();
             return var;
@@ -49,7 +49,9 @@ public:
         }
 #endif
 
-        if (_PyLong_Sign(obj.ptr()) >= 0)
+        if (PyLong_Check(obj.ptr()))
+        {
+            if (_PyLong_NumBits(obj.ptr()) > 63)
             {
                 if (_PyLong_NumBits(obj.ptr()) > 64)
                     throw pykd::OverflowException("int too big to convert");
@@ -58,16 +60,15 @@ public:
             }
             else
             {
-            if (_PyLong_NumBits(obj.ptr()) > 63)
-                throw pykd::OverflowException("int too big to convert");
-
                 var.setLongLong(PyLong_AsLongLong(obj.ptr()));
             }
 
-
             return var;
         }
 
+        throw kdlib::TypeException(L"failed convert argument");
+   }
+
    static python::object NumVariantAdaptor::convertToPython( const kdlib::NumVariant& var )
    {
         if ( var.isChar() )
@@ -281,7 +282,7 @@ public:
 
     static std::string hex(kdlib::NumConvertable& var) {
             kdlib::NumVariant  v = var;
-            return std::string("0x") + std::string(_bstr_t(v.asHex().c_str()));
+            return  _bstr_t(v.asHex().c_str());
     }
 
     static bool isInteger(kdlib::NumConvertable& var) {

pykd/windbgext.cpp

@@ -12,6 +12,8 @@ namespace python = boost::python;
 #include "dbgexcept.h"
 #include "pydbgio.h"
 
+#include <python.h>
+
 using namespace kdlib::windbg;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -228,16 +230,16 @@ KDLIB_EXT_COMMAND_METHOD_IMPL(PykdExt, py)
     {
         PyInterpreterState  *interpreter = localState->interp;
 
-        while( interpreter->tstate_head != NULL )
+        //while( interpreter->tstate_head != NULL )
-        {
+        //{
-            PyThreadState   *threadState = (PyThreadState*)(interpreter->tstate_head);
+        //    PyThreadState   *threadState = (PyThreadState*)(interpreter->tstate_head);
 
-            PyThreadState_Clear(threadState);
+        //    PyThreadState_Clear(threadState);
 
-            PyThreadState_Swap( NULL );
+        //    PyThreadState_Swap( NULL );
 
-            PyThreadState_Delete(threadState);
+        //    PyThreadState_Delete(threadState);
-        }
+        //}
     
         PyInterpreterState_Clear(interpreter);
 

setup/buildall.cmd

@@ -17,3 +17,15 @@ py -3.7 setup.py bdist_zip --plat-name=win32
 py -3.7 setup.py bdist_zip --plat-name=win-amd64
 py -3.7 setup.py bdist_wheel --plat-name=win32 --python-tag=cp37
 py -3.7 setup.py bdist_wheel --plat-name=win-amd64  --python-tag=cp37
+
+py -3.8 setup.py bdist_zip --plat-name=win32
+py -3.8 setup.py bdist_zip --plat-name=win-amd64
+py -3.8 setup.py bdist_wheel --plat-name=win32 --python-tag=cp38
+py -3.8 setup.py bdist_wheel --plat-name=win-amd64  --python-tag=cp38
+
+py -3.9 setup.py bdist_zip --plat-name=win32
+py -3.9 setup.py bdist_zip --plat-name=win-amd64
+py -3.9 setup.py bdist_wheel --plat-name=win32 --python-tag=cp39
+py -3.9 setup.py bdist_wheel --plat-name=win-amd64  --python-tag=cp39
+
+py setup.py bdist_pdb

setup/setup.py

@@ -5,10 +5,11 @@ import os
 import shutil
 import zipfile
 import sys
+import itertools
 
 _name = "pykd"
 _desc = "python windbg extension"
-_version = '0.3.4.0'
+_version = '0.3.4.15'
 
 def getReleaseSrc():
     return 'Release_%d.%d' % sys.version_info[0:2]
@@ -106,6 +107,25 @@ elif "bdist_zip" in sys.argv:
 
     print("OK")
     
+elif "bdist_pdb" in sys.argv:
+
+    #make pdb archive
+    pyVersion = ('2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11')
+    platform = ('Win32', 'x64')
+    
+    pdbFiles = [ os.path.join( platform, 'Release_' + version, 'pykd.pdb') for version, platform in itertools.product( pyVersion, platform ) ]
+    
+    zip_name = "pykd-%s-symbols.zip" %  _version
+    
+    with zipfile.ZipFile(os.path.join(os.path.curdir, 'dist', zip_name), mode='w' ) as archive:
+        for pdbFile in pdbFiles:
+            print( "zipped %s" % (pdbFile) )
+            archive.write( os.path.join(os.path.curdir, '..', 'out', pdbFile), pdbFile, compress_type = zipfile.ZIP_DEFLATED)
+    
+    #pdbFileList = [ os.path.join( os.path.curdir, '..', 'out', fileName) for fileName in (
+    
+
+    pass
 
 
 
@@ -122,127 +142,4 @@ elif "bdist_zip" in sys.argv:
 
 
 
-#from setuptools import setup
-#from wheel.bdist_wheel import bdist_wheel
-#import pkg_resources
-#import argparse
-#import os
-#import shutil
-#import zipfile
-#import sys
-
-#_name = "pykd"
-#_desc = "python windbg extension"
-#_version = '0.3.1.2'
-
-#def getReleaseSrc():
-#    return 'Release_%d.%d' % sys.version_info[0:2]
-
-#def  makeWheel(args):
-
-#    # remove build catalog
-#    build_dir = os.path.join(os.path.curdir, 'build' )
-#    if os.path.exists(build_dir):
-#        shutil.rmtree(build_dir)
-
-#    # make package catalog
-#    package_dir = os.path.join(os.path.curdir, _name )
-#    if os.path.exists(package_dir):
-#        shutil.rmtree(package_dir)
-#    os.mkdir(package_dir)
-
-#    shutil.copy("__init__.py", package_dir)
-
-#    bin_dir = os.path.join( os.path.curdir, '..', 'bin')
-#    pykd_dir =  os.path.join( os.path.curdir, '..', 'out')
-#    if args.plat_name == 'win32':
-#        bin_dir = os.path.join( bin_dir, 'x86')
-#        pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc())
-#    elif args.plat_name == 'win-amd64':
-#        bin_dir = os.path.join( bin_dir, 'x64')
-#        pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc())
-#    else:
-#        assert(0)
-
-#    assert(os.path.isdir(bin_dir))
-
-#    for binFile in  [ f for f in os.listdir(bin_dir) if not os.path.isdir(f) ]:
-#        shutil.copy( os.path.join(bin_dir, binFile), os.path.join(package_dir, binFile) )
-
-#    shutil.copy( os.path.join(pykd_dir, 'pykd.pyd'), os.path.join(package_dir, 'pykd.pyd') )
-
-#    setup(
-#        name = _name,
-#        version = _version,
-#        description = _desc,
-#        cmdclass = { 'bdist_wheel' : bdist_wheel },
-#        packages = ['pykd'],
-#        package_dir = {'pykd': package_dir},
-#        package_data = { 'pykd' :["*.pyd", "*.dll"]},
-#        include_package_data=True,
-#        zip_safe = False,
-#        universal = True,
-#        #python_tag = args.python_tag
-#        )
-
-#def makeZip(args):
-#     #make package catalog
-
-#    package_dir = os.path.join(os.path.curdir, _name )
-#    if os.path.exists(package_dir):
-#        shutil.rmtree(package_dir)
-#    os.mkdir(package_dir)
-
-#    bin_dir = os.path.join( os.path.curdir, '..', 'bin')
-#    pykd_dir =  os.path.join( os.path.curdir, '..', 'out')
-#    if args.plat_name == 'win32':
-#        bin_dir = os.path.join( bin_dir, 'x86')
-#        pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc())
-#    elif args.plat_name == 'win-amd64':
-#        bin_dir = os.path.join( bin_dir, 'x64')
-#        pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc())
-#    else:
-#        assert(0)
-
-#    pyver="%d%d" % sys.version_info[0:2]
-
-#    zip_str = "pykd-%s-py%s-%s" % ( _version, pyver, args.plat_name )
-#    zip_name = zip_str + ".zip"
-
-#    assert(os.path.isdir(bin_dir))
-
-#    for binFile in  [ f for f in os.listdir(bin_dir) if not os.path.isdir(f) ]:
-#        shutil.copy( os.path.join(bin_dir, binFile), os.path.join(package_dir, binFile) )
-
-#    shutil.copy( os.path.join(pykd_dir, 'pykd.pyd'), os.path.join(package_dir, 'pykd.pyd') )
-
-#    dist_dir = os.path.join(os.path.curdir, 'dist')
-#    if not os.path.exists(dist_dir):
-#        os.mkdir(dist_dir)
-
-#    with zipfile.ZipFile(os.path.join(os.path.curdir, 'dist', zip_name), mode='w' ) as archive:
-#        for srcFile in os.listdir(package_dir):
-#            print( "zipped %s" % (srcFile) )
-#            archive.write( os.path.join(package_dir, srcFile), compress_type = zipfile.ZIP_DEFLATED)
-
-#    print("OK")
-
-
-
-
-#parser = argparse.ArgumentParser()
-
-#subparsers = parser.add_subparsers()
-#wheelParser = subparsers.add_parser('bdist_wheel')
-#wheelParser.add_argument('--plat-name', choices = ['win32', 'win-amd64'], default=pkg_resources.get_build_platform() )
-#wheelParser.add_argument('--python-tag', choices=['2.7', '3.5'])
-#wheelParser.set_defaults(func=makeWheel)
-
-#zipParser = subparsers.add_parser('bdist_zip')
-#zipParser.add_argument('--plat-name', choices = ['win32', 'win-amd64'], default=pkg_resources.get_build_platform() )
-#zipParser.set_defaults(func=makeZip)
-
-#args = parser.parse_args()
-#args.func(args)
-
 

snippets/nbl.py

@@ -227,7 +227,7 @@ class IpPacket:
             s += "\tflags: %x\n" % self.flags    
             s += "\toffset: %x" % ( self.offset * 8) 
             if ( self.offset == 0 ) and ( self.flags & 0x4 == 0 ):
-                s += " (not fargmented)\n"
+                s += " (not fragmented)\n"
             elif  self.offset == 0 :
                 s += " (first fragment)\n"
             elif not ( self.flags & 0x4 == 0 ):
@@ -480,7 +480,7 @@ def getPacketsFromNbl( nblAddr ):
         
     except TypeException:      
 
-        dprintln( "the symbols ar wrong" )  
+        dprintln( "the symbols are wrong" )  
 
 def printNblStruct( nblAddr, showNdisStruct = False, beginProtocol="eth", beginOffset=0 ):
 
@@ -525,7 +525,7 @@ def printNblStruct( nblAddr, showNdisStruct = False, beginProtocol="eth", beginO
 
     except TypeException:      
 
-        dprintln( "the symbols ar wrong" )
+        dprintln( "the symbols are wrong" )
 
 def main():
 
@@ -536,7 +536,7 @@ def main():
     parser = OptionParser(usage="usage: !py nbl [options] address")
     parser.add_option("-s", "--struct", action="store_true",  dest="showNdisStruct", default=False, help="Show NDIS structures" )  
     parser.add_option("-p", "--proto", action="store", type="string", dest="startProtocol", default="eth", help="Packet protocol. Can be eth, ip4, ip6, tcp, udp. By default - eth." )
-    parser.add_option("-o", "--offset", action="store", type="long", dest="beginOffset", default=0, help="Bytes offset from packet begining" )
+    parser.add_option("-o", "--offset", action="store", type="long", dest="beginOffset", default=0, help="Bytes offset from packet beginning" )
     parser.add_option("-r", "--raw", action="store_true", dest="rawBuffer", default=False, help="Show raw buffer")
    
     (options, args) = parser.parse_args()

snippets/pytowiki.py

@@ -6,7 +6,7 @@ import sys
 
 
 def usage():
-    print "python pytowiki.py module_name output_file"
+    print("python pytowiki.py module_name output_file")
 
 
 class CodeplexFormatter:
@@ -134,7 +134,7 @@ def buildDoc( ioStream, formatter, apiInfo ):
                 ioStream.write( formatter.bulletItem( formatter.link( p[0],  cls.__name__ + "." + p[0]) ) )
             ioStream.write( formatter.endl() )
 
-        methods = filter( lambda m: m.__doc__ != None, cls.methods )
+        methods = list(filter( lambda m: m.__doc__ != None, cls.methods ) )
             
         if methods:
             ioStream.write( formatter.header4( "Methods:") )
@@ -174,7 +174,7 @@ def main():
 
         module = __import__( moduleName )
 
-        with file( fileName, "w" ) as wikiIo:
+        with open( fileName, "w" ) as wikiIo:
 
             apiInfo = ModuleInfo( module )
 
@@ -185,7 +185,7 @@ def main():
 
     except ImportWarning:
 
-        print "failed to import module " + moduleName
+        print("failed to import module ", moduleName)
 
 
 if __name__ == "__main__":

test/scripts/arm64dumptest.py

@@ -6,7 +6,7 @@ import os
 class ARM64DumpTest(unittest.TestCase):
     def setUp(self):
         dump_file = os.path.join( os.path.dirname(sys.argv[0]),
-                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm64_mem.cab" )
+                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm64_mem\win10_arm64_mem.cab" )
         self.dump_id = pykd.loadDump( dump_file )
 
     def tearDown(self):

test/scripts/armdumptest.py

@@ -6,7 +6,7 @@ import os
 class ARMDumpTest(unittest.TestCase):
     def setUp(self):
         dump_file = os.path.join( os.path.dirname(sys.argv[0]),
-                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm_rpi3_mem.cab" )
+                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win10_arm_rpi3_mem\win10_arm_rpi3_mem.cab" )
         self.dump_id = pykd.loadDump( dump_file )
 
     def tearDown(self):

test/scripts/eventtest.py

@@ -3,23 +3,36 @@ import unittest
 import target
 import pykd
 
-class handler( pykd.eventHandler ):
+class OutHandler( pykd.eventHandler ):
 
     def __init__(self):
         pykd.eventHandler.__init__(self)
-        self.counter=0
+        self.out_counter=0
+        self.verbose_counter = 0
         
-    def onException(self, param):
+    def onDebugOutput(self, text, mask):
-        self.counter += 1
+        if mask == pykd.outputFlag.Normal:
-        return pykd.DEBUG_STATUS_NO_CHANGE
+            self.out_counter += 1
+        elif mask == pykd.outputFlag.Verbose:
+            self.verbose_counter += 1    
 
-    def onExecutionStatusChange(self,status):
+class OutputHandlerTest( unittest.TestCase ):
-        print status
 
-class EventTest( unittest.TestCase ):
+    def setUp(self):
+        self.oldMask = pykd.getOutputMask()
+        self.handler = OutHandler()     
 
-    def testDebugBreak( self ):
+    def tearDown(self):
-         h = handler()
+        pykd.killAllProcesses()
-         pykd.go()
+        pykd.setOutputMask(self.oldMask)
-         pykd.go()
+
-         self.assertEqual( 2, h.counter )
+    def testDebugOutput(self):
+        pykd.startProcess( target.appPath )
+        self.assertTrue( 0 < self.handler.out_counter)
+        self.assertFalse( 0 < self.handler.verbose_counter)
+
+    def testDebugOutputMask(self):
+        pykd.setOutputMask(pykd.outputFlag.Normal | pykd.outputFlag.Verbose)
+        pykd.startProcess( target.appPath )
+        self.assertTrue( 0 < self.handler.out_counter)
+        self.assertTrue( 0 < self.handler.verbose_counter)

test/scripts/memtest.py

@@ -183,6 +183,12 @@ class MemoryTest( unittest.TestCase ):
         self.assertFalse( pykd.isValid( 0 ) )
         self.assertFalse( pykd.isValid( 0xDEADBEAF ) )
 
+    def testVaAttrib(self):
+        self.assertEqual( \
+           (pykd.memoryProtect.PageWriteCopy, pykd.memoryState.Commit, pykd.memoryType.Image), \
+           pykd.getVaAttributes(target.module.begin()) \
+           )
+        
     def testPtrList( self ):
         lst = pykd.loadPtrList( target.module.g_listHead )
         self.assertEqual( 5, len( lst ) )

test/scripts/moduletest.py

@@ -139,4 +139,25 @@ class ModuleTest( unittest.TestCase ):
     def testModuleList(self):
         self.assertTrue( [] != pykd.getModulesList() )
 
+    def testContain(self):
+        self.assertTrue("voidPtr" in target.module)
+        self.assertTrue("structTest" in target.module)
+        self.assertFalse("NotExist" in target.module)
+        self.assertRaises(Exception, lambda md : 2 in md, target.module)
+
+    def testGetByKey(self):
+        self.assertFalse(None == target.module["voidPtr"])
+        self.assertFalse(None == target.module["structTest"] )
+        self.assertRaises(KeyError, lambda md : target.module["Not Exist"], target.module)
+
+    def testEvalInModuleScope(self):
+        self.assertEqual( target.module.rva('voidPtr'), eval("voidPtr - %#x" % target.module.begin(), globals(), target.module) )
+
+    def testHasSymbol(self):
+        self.assertTrue(target.module.hasSymbol("voidPtr"))
+        self.assertTrue(target.module.hasSymbol("structTest"))
+        self.assertFalse(target.module.hasSymbol("notExists"))
+
+    def testPrint(self):
+        modAsStr = str(target.module)
 

test/scripts/pykdtest.py

@@ -30,6 +30,7 @@ import synsymtest
 import taggedtest
 import arm64dumptest
 import armdumptest
+import eventtest
 
 pykd.initialize()
 
@@ -65,12 +66,16 @@ def getTestSuite( singleName = "" ):
 
                 unittest.TestLoader().loadTestsFromTestCase( breakpoint.BreakpointTest ),
                 unittest.TestLoader().loadTestsFromTestCase( stacktest.StackTest ),
+                unittest.TestLoader().loadTestsFromTestCase( stacktest.InlineStackTest ),
+                unittest.TestLoader().loadTestsFromTestCase( stacktest.DiaRegToRegRelativeI386Test ),
+                unittest.TestLoader().loadTestsFromTestCase( stacktest.DiaRegToRegRelativeAmd64Test ),
                 unittest.TestLoader().loadTestsFromTestCase( mspdbtest.MsPdbTest ),
                 unittest.TestLoader().loadTestsFromTestCase( targetprocess.ProcessTest ),
                 unittest.TestLoader().loadTestsFromTestCase( ehloadtest.EhLoadTest ),
                 unittest.TestLoader().loadTestsFromTestCase( taggedtest.TaggedTest ),
                 unittest.TestLoader().loadTestsFromTestCase( arm64dumptest.ARM64DumpTest ),
                 unittest.TestLoader().loadTestsFromTestCase( armdumptest.ARMDumpTest ),
+                unittest.TestLoader().loadTestsFromTestCase( eventtest.OutputHandlerTest ),
                
                 #unittest.TestLoader().loadTestsFromTestCase( excepttest.ExceptionTest ),
             ] ) 
@@ -91,7 +96,7 @@ if __name__ == "__main__":
     target.moduleName = os.path.splitext(os.path.basename(target.appPath))[0]
 
     unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run( getTestSuite() )
-    #unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run( getTestSuite("typedvar.TypedVarTest.testAttr") )
+    #unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run( getTestSuite("typedvar.TypedVarTest.testEvalExprScopeLong") )
 
     try: input = raw_input
     except NameError: pass

test/scripts/pykdtest.pyproj

@@ -8,18 +8,18 @@
     <StartupFile>pykdtest.py</StartupFile>
     <SearchPath>
     </SearchPath>
-    <WorkingDirectory>..\..\out\x64\Debug_2.7</WorkingDirectory>
+    <WorkingDirectory>C:\Users\User\Documents\projects\pykd2017\out\x64\Debug_3.7</WorkingDirectory>
     <OutputPath>.</OutputPath>
     <Name>pykdtest</Name>
     <RootNamespace>pykdtest</RootNamespace>
     <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <CommandLineArguments>C:\proj\pykd-dev\out\x64\Debug\targetapp.exe</CommandLineArguments>
+    <CommandLineArguments>C:\Users\User\Documents\projects\pykd2017\out\x64\Debug_2.7\targetapp.exe</CommandLineArguments>
     <InterpreterPath />
     <InterpreterArguments>
     </InterpreterArguments>
     <EnableNativeCodeDebugging>True</EnableNativeCodeDebugging>
     <IsWindowsApplication>False</IsWindowsApplication>
-    <InterpreterId>Global|PythonCore|2.7</InterpreterId>
+    <InterpreterId>Global|PythonCore|3.7</InterpreterId>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,6 +63,8 @@
     <InterpreterReference Include="Global|PythonCore|2.7-32" />
     <InterpreterReference Include="Global|PythonCore|2.7" />
     <InterpreterReference Include="Global|PythonCore|3.6" />
+    <InterpreterReference Include="Global|PythonCore|3.7" />
+    <InterpreterReference Include="Global|PythonCore|3.7-32" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />

test/scripts/stacktest.py

@@ -1,4 +1,7 @@
 import unittest
+import os
+import sys
+
 import pykd
 import target
 
@@ -55,3 +58,81 @@ class StackTest(unittest.TestCase):
         self.assertEqual(0, len(topFrame.getLocals()))
 
 
+class InlineStackTest(unittest.TestCase):
+
+    def setUp(self):
+        dumpDir = os.path.join( os.path.dirname(sys.argv[0]), r"..\..\kdlibcpp\kdlib\tests\dumps\targetapp_stacktest_x64_release")
+        dump_file = os.path.join( dumpDir, "targetapp_stacktest_x64_release.cab" )
+        self.symbolPath = pykd.getSymbolPath()
+        symbolPath = self.symbolPath + ";" + dumpDir
+        pykd.setSymbolPath(symbolPath)
+        self.dump_id = pykd.loadDump( dump_file )
+
+    def tearDown(self):
+        pykd.closeDump( self.dump_id )
+        pykd.setSymbolPath(self.symbolPath)
+
+    def testGetStack(self):
+
+        expectedStack = [
+                  'targetapp!stackTestClass::stackMethod',
+                  'targetapp!stackTestRun2',
+                  'targetapp!stackTestRun1',
+                  'targetapp!stackTestRun']
+
+        realStack = []
+        for frame in pykd.getStack(inlineFrames = True):
+            moduleName, symbolName, disp = frame.findSymbol()
+            realStack.append( "%s!%s" % ( moduleName, symbolName ) )
+
+        self.assertEqual( expectedStack, realStack[0:4])
+
+    def testFrameIsInline(self):
+        self.assertEqual([True, True, False, True], 
+                         [fr.isInline() for fr in pykd.getStack(inlineFrames = True)][:4]
+                         )
+
+    def testGetSourceLine(self):
+
+        expectedStack = ['targetapp.cpp+129', 'targetapp.cpp+144', 'targetapp.cpp+172', 'targetapp.cpp+185']
+
+        realStack = []
+        for frame in pykd.getStack(inlineFrames = True)[:4]:
+            fileName, lineNo = frame.getSourceLine()
+            realStack.append("%s+%s" % ( os.path.basename(fileName), lineNo ) )
+ 
+        self.assertEqual( expectedStack, realStack)
+
+class DiaRegToRegRelativeI386Test(unittest.TestCase):
+    def setUp(self):
+        dumpDir = os.path.join( os.path.dirname(sys.argv[0]), r"..\..\kdlibcpp\kdlib\tests\dumps\targetapp_test_cv_allreg_i386")
+        dump_file = os.path.join( dumpDir, "targetapp_test_cv_allreg_i386.cab" )
+        self.symbolPath = pykd.getSymbolPath()
+        symbolPath = self.symbolPath + ";" + dumpDir
+        pykd.setSymbolPath(symbolPath)
+        self.dump_id = pykd.loadDump( dump_file )
+
+    def tearDown(self):
+        pykd.closeDump( self.dump_id )
+        pykd.setSymbolPath(self.symbolPath)
+
+    def testParams(self):
+        params = pykd.getFrame().getParams()
+        self.assertNotEqual(0, len(params))
+
+class DiaRegToRegRelativeAmd64Test(unittest.TestCase):
+    def setUp(self):
+        dumpDir = os.path.join( os.path.dirname(sys.argv[0]), r"..\..\kdlibcpp\kdlib\tests\dumps\targetapp_test_cv_allreg_amd64")
+        dump_file = os.path.join( dumpDir, "targetapp_test_cv_allreg_amd64.cab" )
+        self.symbolPath = pykd.getSymbolPath()
+        symbolPath = self.symbolPath + ";" + dumpDir
+        pykd.setSymbolPath(symbolPath)
+        self.dump_id = pykd.loadDump( dump_file )
+
+    def tearDown(self):
+        pykd.closeDump( self.dump_id )
+        pykd.setSymbolPath(self.symbolPath)
+
+    def testLocals(self):
+        locals = pykd.getFrame().getLocals()
+        self.assertNotEqual(0, len(locals))

test/scripts/synsymtest.py

@@ -28,3 +28,15 @@ class SynSymTest(unittest.TestCase):
         self.assertRaises( pykd.DbgException, target.module.offset, "synSym2" )
 
         self.assertRaises( pykd.DbgException, pykd.removeSyntheticSymbol, _synsym )
+
+    def testModule(self):
+        """Add and remove synthetic module"""
+        base = 64 * 1024
+
+        pykd.addSyntheticModule(base, 1024, "artificial_module1")
+        pykd.addSyntheticModule(base + 1024, 1024, "artificial_module2", "artificial_module2_path")
+
+        pykd.removeSyntheticSymbol( pykd.addSyntheticSymbol(base, 1, "artificial_symbol") )
+
+        pykd.removeSyntheticModule(base + 1024)
+        pykd.removeSyntheticModule(base)

test/scripts/taggedtest.py

@@ -6,7 +6,7 @@ import os
 class TaggedTest(unittest.TestCase):
     def setUp(self):
         dump_file = os.path.join( os.path.dirname(sys.argv[0]),
-                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win8_x64_mem.cab" )
+                                  r"..\..\kdlibcpp\kdlib\tests\dumps\win8_x64_mem\win8_x64_mem.cab" )
         self.dump_id = pykd.loadDump( dump_file )
 
         self._existing_id = "D03DC06F-D88E-44C5-BA2A-FAE035172D19"

test/scripts/typedvar.py

@@ -21,6 +21,14 @@ class TypedVarTest( unittest.TestCase ):
         tv = pykd.typedVar( "g_structTest" )
         tv = pykd.typedVar( target.moduleName + "!g_structTest" )
 
+                
+    def testCompareWithNone(self):
+        tv = target.module.typedVar( "ucharVar" )
+        self.assertFalse(tv == None)
+        self.assertTrue(tv != None)
+        self.assertFalse(not tv)
+        self.assertTrue(tv)
+
     def testBaseTypes(self):
         self.assertEqual( 10, target.module.typedVar( "ucharVar" ) )
         self.assertEqual( 1020, target.module.typedVar( "ushortVar" ) )
@@ -295,8 +303,8 @@ class TypedVarTest( unittest.TestCase ):
     def testUdtSubscribe(self):
         tv = pykd.typedVar( "g_virtChild" )
         self.assertEqual( 6, len(tv) )
-        fieldName = tv.fieldName(5)
+        fieldName = tv.fieldName(3)
-        fieldVal = tv.field(5)
+        fieldVal = tv.field(3)
 
         self.assertEqual( fieldName, "m_baseField" )
         self.assertEqual( fieldVal, tv.m_baseField )
@@ -437,10 +445,60 @@ class TypedVarTest( unittest.TestCase ):
       
     def testAttr(self):
         var = target.module.typedVar("structTest", [0x55] * 20 )
-        self.assertTrue(hasattr(var, "m_field3"))
         setattr(var, "m_field1", 11)
         self.assertEqual(11, getattr(var, "m_field1"))
+        self.assertRaises(AttributeError, lambda x: getattr(x, "noexists"), var)
+
+    def testEvalPyScope(self):
+        var = target.module.typedVar("structTest", [0x55] * 20 )
+        self.assertEqual( var.m_field1 * 17, eval("m_field1 * 17", globals(), var) )
+
+    def testEvalExpr(self):
+        self.assertEqual( 2+2, pykd.evalExpr("2+2") )
+        self.assertEqual( target.module.typedVar("g_structTest").m_field1, pykd.evalExpr("g_structTest.m_field1") )
+        self.assertEqual( target.module.typedVar("g_testArray")[1].m_field3, pykd.evalExpr("(g_testArray + 1)->m_field3") )
+
+    def testEvalExprScope(self):
+
+        v1 = target.module.typedVar( "ulongVar" )
+        v2 = target.module.typedVar( "g_structTest" )
+
+        scope = { "v1" : v1, "v2" : v2 }
+        self.assertEqual( v1 + v2.m_field1, pykd.evalExpr("v1 + v2.m_field1", scope) )
+
+    def testEvalExprScopeLong(self):
+        v1 = 100
+        v2 = -500
+        scope = { "v1" : v1, "v2" : v2 }
+        self.assertEqual( v1 + v2, pykd.evalExpr("v1 + v2", scope))
+        self.assertEqual( v1 * v2, pykd.evalExpr("v1 * v2", locals()))
+
+    def testEvalExprScopeStruct(self):
+        var = pykd.typedVar("g_structTest1")
+        self.assertEqual(var.m_field1, pykd.evalExpr("m_field1", var))
+        self.assertEqual(var.m_field4.deref().m_field1, pykd.evalExpr("m_field4->m_field1", var))
+
+    def testEvalExprSizeof(self):
+        self.assertEqual(4, pykd.evalExpr("sizeof(int)"))
+        self.assertEqual(4, pykd.evalExpr("sizeof(int&)"))
+        self.assertEqual(pykd.ptrSize() * 10, pykd.evalExpr("sizeof(int*[10])"))
+        self.assertEqual(pykd.ptrSize(), pykd.evalExpr("sizeof(int(*)[10])"))
+
+    def testContain(self):
+        var = pykd.typedVar("g_structTest")
+        self.assertTrue("m_field1" in var)
+        self.assertFalse("NotExist" in var)
+        self.assertRaises(Exception, lambda var : 2 in var, var)
+
+    def testHasField(self):
+        var = pykd.typedVar("g_structTest")
+        self.assertTrue(var.hasField("m_field1"))
+        self.assertFalse(var.hasField("NotExist"))
+
+    def testHasMethod(self):
+        var = pykd.typedVar("g_classChild")
+        self.assertTrue(var.hasMethod("childMethod"))
+        self.assertTrue(var.hasMethod("staticMethod"))
+        self.assertTrue(var.hasMethod("virtMethod1"))
+        self.assertFalse(var.hasMethod("notExist"))
         
-        self.assertFalse(hasattr(var, "noexisit"))
-        self.assertRaises(AttributeError, getattr, *(var, "noexists"))
-        self.assertRaises(AttributeError, setattr, *(var, "noexists", 0))

test/scripts/typeinfo.py

@@ -40,11 +40,9 @@ class TypeInfoTest( unittest.TestCase ):
         """ get field of the complex type """
         ti1 = target.module.type( "structTest" )
         self.assertTrue( "UInt4B", ti1.m_field0.name() )
-        self.assertTrue( "UInt4B", ti1["m_field0"].name() )
+        self.assertTrue( "m_field0" in ti1 )
-        self.assertTrue( hasattr( ti1, "m_field0" ) )
+        self.assertFalse( "not_exist" in ti1) # non-exsisting field
-        self.assertFalse( hasattr( ti1, "not_exists" ) )
         self.assertRaises( AttributeError, lambda t: t.not_exists, ti1) # non-exsisting field
-        self.assertRaises( KeyError, lambda t: t["not_exists"], ti1) # non-exsisting field
 
 
     def testBaseTypes( self ):
@@ -164,21 +162,21 @@ class TypeInfoTest( unittest.TestCase ):
         self.assertEqual( "structTest", ti.deref().name() )
 
         ti =  pykd.typeInfo("structTest[2]")
-        self.assertRaises( pykd.TypeException, ti.deref );
+        self.assertEqual( "structTest", ti.deref().name() )
 
         ti = target.module.type("classChild")
-        self.assertRaises( pykd.TypeException, ti.deref );
+        self.assertRaises( pykd.TypeException, ti.deref )
 
     def testNestedStruct( self ):
         ti = target.module.type("structWithNested")
-        self.assertTrue( hasattr( ti, "m_field" ) )
+        self.assertTrue( ti.hasField("m_field"))
-        self.assertTrue( hasattr( ti, "m_field3" ) )
+        self.assertTrue( ti.hasField("m_field3"))
-        self.assertTrue( hasattr( ti, "m_unnameStruct" ) )
+        self.assertTrue( ti.hasField("m_unnameStruct"))
-        self.assertTrue( hasattr( ti.m_unnameStruct, "m_field2" ) )
+        self.assertTrue( ti.m_unnameStruct.hasField("m_field2"))
-        self.assertFalse( hasattr( ti, "m_field2" ) )
+        self.assertFalse( ti.hasField( "m_field2" ) )
-        self.assertFalse( hasattr( ti, "m_nestedFiled" ) )
+        self.assertFalse( ti.hasField( "m_nestedFiled" ) )
         ti = target.module.type("structWithNested::Nested")
-        self.assertTrue( hasattr( ti, "m_nestedFiled" ) )
+        self.assertTrue( ti.hasField( "m_nestedFiled" ) )
 
     def testPrint(self):
         self.assertTrue( str(target.module.type( "ucharVar" ) ) )
@@ -244,16 +242,12 @@ class TypeInfoTest( unittest.TestCase ):
         ti = pykd.typeInfo("UInt8B").arrayOf(10)
         self.assertTrue( "UInt8B[10]", ti.name() )
         
-    def testCompareWihNone(self):
+    def testCompareWithNone(self):
         ti = pykd.typeInfo("UInt8B")
-        if ti == None:
+        self.assertFalse(ti == None)
-            pass
+        self.assertTrue(ti != None)
-        if ti != None:
+        self.assertFalse(not ti)
-            pass
+        self.assertTrue(ti)
-        if not ti:
-            pass
-        if ti:
-            pass
 
     def testFunction(self):
         functype = target.module.typedVar( "CdeclFuncPtr" ).type().deref()
@@ -351,17 +345,48 @@ class TypeInfoTest( unittest.TestCase ):
         self.assertEqual( classChild.baseClassOffset(0), classChild.baseClassOffset('classBase1'))
         self.assertEqual(classChild.baseClassOffset(1), classChild.baseClassOffset('classBase2'))
 
-
     def  testPdbTypeProvider(self):
         pdb = target.module.symfile()
         typeProvider = pykd.getTypeInfoProviderFromPdb(pdb)
         self.assertEqual("structTest", typeProvider.getTypeByName("structTest").name())
         self.assertEqual("structTest", typeProvider.structTest.name())
-        self.assertEqual(22, len(list(typeProvider.typeIterator("*struct*"))))
+        self.assertEqual(15, len(list(typeProvider.typeIterator("*struct*"))))
 
     def testScopeName(self):
         self.assertEqual( target.module.name(), pykd.typeInfo( "structTest" ).scopeName() )
         self.assertEqual( target.module.name(), pykd.typeInfo( "structWithNested::Nested" ).scopeName() )
  
+    def testContain(self):
+        ti = target.module.type( "structTest" )
+        self.assertTrue("m_field1" in ti)
+        self.assertFalse("NotExist" in ti)
+        self.assertRaises(Exception, lambda t : 2 in t, ti)
 
+    def testTemplateType(self):
+        ti = target.module.type("g_testTemplateTwoTypes")
+        self.assertTrue(ti.isTemplate)
+        self.assertEqual(['int', 'TestClassTemplate<int>'], ti.getTemplateArgs() )
 
+    def testMembers(self):
+        self.assertEqual(
+           ['__VFN_table', '__VFN_table', 'm_staticConst', 'm_staticField', 'm_childField',
+           'm_childField2', 'm_childField3', 'm_enumField'],
+           [ member[0] for member in pykd.typeInfo( "classChild" ).members() ])
+
+    def testIsStaticField(self):
+        ti = pykd.typeInfo("classChild")
+        self.assertTrue(ti.isStaticField("m_staticField"))
+        self.assertFalse(ti.isStaticField("m_baseField"))
+
+    def testIsConstField(self):
+        ti = pykd.typeInfo("classChild")
+        self.assertTrue(ti.isStaticField("m_staticConst"))
+        self.assertFalse(ti.isConstField("m_staticConst"))
+
+    #def testClangCompile(self):
+    #    src_code = '#include <windows.h>\r\n'
+    #    include_path = '"C:/Program Files (x86)/Windows Kits/8.1/Include/um";"C:/Program Files (x86)/Windows Kits/8.1/Include/shared'
+    #    compile_opts = '-I%s -w' % include_path
+    #    symbolEnum = pykd.getSymbolProviderFromSource(src_code, compile_opts)
+    #    for symName, _, symType in symbolEnum :
+    #        print( symName, symType.name() )