From 20a3c5904a871e1662fa855a1caefb246efcf652 Mon Sep 17 00:00:00 2001
From: ussrhero <ussrhero@outlook.com>
Date: Sat, 20 Apr 2019 21:40:34 +0300
Subject: [PATCH] set version to 3.4.6

---
 pykd/pykdver.h           |  2 +-
 pykd/pymod.cpp           | 24 ++++++++++++------------
 pykd/variant.h           |  2 +-
 test/scripts/typedvar.py |  6 ++++++
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pykd/pykdver.h b/pykd/pykdver.h
index c45bc4d..a2324d2 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 4
-#define PYKD_VERSION_BUILDNO    5
+#define PYKD_VERSION_BUILDNO    6
 
 #define __VER_STR2__(x) #x
 #define __VER_STR1__(x) __VER_STR2__(x)
diff --git a/pykd/pymod.cpp b/pykd/pymod.cpp
index 09e54cc..5171759 100644
--- a/pykd/pymod.cpp
+++ b/pykd/pymod.cpp
@@ -1441,18 +1441,18 @@ void pykd_init()
         ;
 
     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)
+        .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)
         ;
 
     // C++ exception translation to python
diff --git a/pykd/variant.h b/pykd/variant.h
index 3bfeef2..44a0c6f 100644
--- a/pykd/variant.h
+++ b/pykd/variant.h
@@ -285,7 +285,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) {
diff --git a/test/scripts/typedvar.py b/test/scripts/typedvar.py
index cd4572f..7c25d19 100644
--- a/test/scripts/typedvar.py
+++ b/test/scripts/typedvar.py
@@ -469,6 +469,12 @@ class TypedVarTest( unittest.TestCase ):
         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)