diff --git a/setup/pykd_setup_common.nsh b/setup/pykd_setup_common.nsh index 4e3070a..0f28456 100644 --- a/setup/pykd_setup_common.nsh +++ b/setup/pykd_setup_common.nsh @@ -27,7 +27,7 @@ SetCompressor LZMA !define PRODUCT_SHORT_NAME "pykd" !define PRODUCT_FULL_NAME "Python extension for WinDbg" -!define PRODUCT_VERSION "0.0.0.19" +!define PRODUCT_VERSION "0.0.0.20" !define PRODUCT_URL "http://pykd.codeplex.com/" !define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}" !define PRODUCT_MANUFACTURER "PyKd Team" diff --git a/snippets/stlp.py b/snippets/stlp.py index 4376c79..e5c4d5a 100644 --- a/snippets/stlp.py +++ b/snippets/stlp.py @@ -3,15 +3,18 @@ import sys from pykd import * +def ptr_t(): + return is64bitSystem() and ulonglong_t or ulong_t + StlpNodeBase = typeInfo() -StlpNodeBase.append(ptr_t, "color") -StlpNodeBase.append(ptr_t, "parent") -StlpNodeBase.append(ptr_t, "left") -StlpNodeBase.append(ptr_t, "right") +StlpNodeBase.append(ptr_t(), "color") +StlpNodeBase.append(ptr_t(), "parent") +StlpNodeBase.append(ptr_t(), "left") +StlpNodeBase.append(ptr_t(), "right") StlpMap = typeInfo() StlpMap.append(StlpNodeBase, "header") -StlpMap.append(ptr_t, "node_count") +StlpMap.append(ptr_t(), "node_count") def stlpMapIncrement(addr): node = StlpNodeBase.load(addr)