From 169571c4dc236824d003e2f8097b37609c7dc4d7 Mon Sep 17 00:00:00 2001
From: "SND\\kernelnet_cp"
<SND\kernelnet_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Fri, 27 Mar 2015 16:40:05 +0000
Subject: [PATCH] [0.3.x] fixed : getSystemInfo returns incorrect information
git-svn-id: https://pykd.svn.codeplex.com/svn@90136 9b283d60-5439-405e-af05-b73fd8c4d996
---
pykd/pydbgeng.cpp | 3 ++-
pykd/pykd.rc | Bin 5308 -> 5310 bytes
pykd/pykd_vc120.vcxproj | 2 ++
pykd/pykdver.h | 2 +-
.../pykd_bootstrapper_vc120.vcxproj | 16 ++++++++--------
pykd_bootstrapper/stdafx.h | 1 +
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pykd/pydbgeng.cpp b/pykd/pydbgeng.cpp
index d711906..40358b8 100644
--- a/pykd/pydbgeng.cpp
+++ b/pykd/pydbgeng.cpp
@@ -57,7 +57,8 @@ std::wstring printSystemVersion( kdlib::SystemInfo& sysInfo )
std::wstringstream sstr;
sstr << L"Major Version: " << sysInfo.majorVersion << std::endl;
- sstr << L"Minor Version: " << sysInfo.minorVersion << std::endl;;
+ sstr << L"Minor Version: " << sysInfo.minorVersion << std::endl;
+ sstr << L"Build: " << sysInfo.buildNumber << std::endl;
sstr << L"Description: " << sysInfo.buildDescription << std::endl;
return sstr.str();
diff --git a/pykd/pykd.rc b/pykd/pykd.rc
index 8cdd8aff43e8ad2ca95e061f4a848da73c675ee5..b6d6e409e73a051528aa456e47753d60022ae962 100644
GIT binary patch
delta 36
rcmdm^xleNg7n5)~LncEWLkdGaLpeh+gC0W$gVN-WjFOv8m^y?2wwwuo
delta 20
ccmdm|xkqyY7t`b^Y(kSiF-mMUW9kqB08hvU>i_@%
diff --git a/pykd/pykd_vc120.vcxproj b/pykd/pykd_vc120.vcxproj
index 75d2284..77432d8 100644
--- a/pykd/pykd_vc120.vcxproj
+++ b/pykd/pykd_vc120.vcxproj
@@ -146,6 +146,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\kdlibcpp\include</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -165,6 +166,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\kdlibcpp\include;</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
diff --git a/pykd/pykdver.h b/pykd/pykdver.h
index 114dc7a..1865eee 100644
--- a/pykd/pykdver.h
+++ b/pykd/pykdver.h
@@ -2,7 +2,7 @@
#define PYKD_VERSION_MAJOR 0
#define PYKD_VERSION_MINOR 3
#define PYKD_VERSION_SUBVERSION 0
-#define PYKD_VERSION_BUILDNO 20
+#define PYKD_VERSION_BUILDNO 21
#define __VER_STR2__(x) #x
#define __VER_STR1__(x) __VER_STR2__(x)
diff --git a/pykd_bootstrapper/pykd_bootstrapper_vc120.vcxproj b/pykd_bootstrapper/pykd_bootstrapper_vc120.vcxproj
index 49e44c1..842b659 100644
--- a/pykd_bootstrapper/pykd_bootstrapper_vc120.vcxproj
+++ b/pykd_bootstrapper/pykd_bootstrapper_vc120.vcxproj
@@ -73,19 +73,19 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|Win32'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>pykd</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'">
<LinkIncremental>true</LinkIncremental>
- <TargetName>pykd</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'">
<LinkIncremental>false</LinkIncremental>
- <TargetName>pykd</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'">
<LinkIncremental>false</LinkIncremental>
- <TargetName>pykd</TargetName>
+ <TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|Win32'">
<ClCompile>
@@ -100,7 +100,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_2.7|x64'">
@@ -116,7 +116,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|Win32'">
@@ -137,7 +137,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_2.7|x64'">
@@ -158,7 +158,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>export.def</ModuleDefinitionFile>
- <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <OutputFile>$(OutDir)pykd$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/pykd_bootstrapper/stdafx.h b/pykd_bootstrapper/stdafx.h
index 677e68a..a8b112f 100644
--- a/pykd_bootstrapper/stdafx.h
+++ b/pykd_bootstrapper/stdafx.h
@@ -12,5 +12,6 @@
#include <windows.h>
+#define BOOST_PYTHON_STATIC_LIB
// TODO: reference additional headers your program requires here