From 35ea621a4ef883b0735c827d5d5c126b86451e3c Mon Sep 17 00:00:00 2001
From: SupSuper
Date: Wed, 19 Dec 2018 01:25:18 +0000
Subject: MSVC: Add visualiser for unicode strings

---
 devtools/create_project/scripts/scummvm.natvis | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/devtools/create_project/scripts/scummvm.natvis b/devtools/create_project/scripts/scummvm.natvis
index 5470f20ba7..8d839246cf 100644
--- a/devtools/create_project/scripts/scummvm.natvis
+++ b/devtools/create_project/scripts/scummvm.natvis
@@ -108,7 +108,21 @@
     <Expand>
       <Item Name="[size]">_size</Item>
       <Item Condition="_str != _storage" Name="[capacity]">_extern._capacity</Item>
-      <Item Condition="_str != _storage" Name="[refCount]">*_extern._refCount</Item>
+      <Item Condition="_str != _storage &amp;&amp; _extern._refCount != 0" Name="[refCount]">*_extern._refCount</Item>
+      <ArrayItems>
+        <Size>_size</Size>
+        <ValuePointer>_str</ValuePointer>
+      </ArrayItems>
+    </Expand>
+  </Type>
+
+  <Type Name="Common::U32String">
+    <DisplayString>{_str,s32}</DisplayString>
+    <StringView>_str,s32</StringView>
+    <Expand>
+      <Item Name="[size]">_size</Item>
+      <Item Condition="_str != _storage" Name="[capacity]">_extern._capacity</Item>
+      <Item Condition="_str != _storage &amp;&amp; _extern._refCount != 0" Name="[refCount]">*_extern._refCount</Item>
       <ArrayItems>
         <Size>_size</Size>
         <ValuePointer>_str</ValuePointer>
-- 
cgit v1.2.3