From 3b1c98bda622e4d2d5488d8549c947e44f274ffc Mon Sep 17 00:00:00 2001
From: ridwanabdillahi <91507758+ridwanabdillahi@users.noreply.github.com>
Date: Wed, 28 Sep 2022 15:02:15 -0700
Subject: [PATCH] Update the Natvis definiton for `HSTRING` to rely on the
 memory layout of Natvis as opposed to the internal data structure.

---
 crates/libs/windows/windows.natvis | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/libs/windows/windows.natvis b/crates/libs/windows/windows.natvis
index 71574e1fde..9300c81374 100644
--- a/crates/libs/windows/windows.natvis
+++ b/crates/libs/windows/windows.natvis
@@ -27,18 +27,20 @@
   </Type>
 
   <Type Name="windows::core::strings::hstring::HSTRING">
-    <DisplayString Condition="__0 == nullptr">""</DisplayString>
-    <DisplayString>{((char16_t*)__0->data),[__0->len]su}</DisplayString>
+    <Intrinsic Name="header" Expression="*((windows::core::strings::hstring::Header**)this)" ReturnType="windows::core::strings::hstring::Header *" />
+    <Intrinsic Name="is_empty" Expression="header() == nullptr" />
+    <DisplayString Condition="is_empty()">""</DisplayString>
+    <DisplayString>{((char16_t*)header()->data),[header()->len]su}</DisplayString>
 
     <Expand>
-      <Item Name="[len]">__0 == nullptr ? (unsigned int)0 : __0->len</Item>
-      <Item Name="[ref_count]" Condition="__0 != nullptr">__0->count</Item>
-      <Item Name="[flags]" Condition="__0 != nullptr">__0->flags</Item>
-      <Synthetic Name="[chars]" Condition="__0 != nullptr">
+      <Item Name="[len]">is_empty() ? (unsigned int)0 : header()->len</Item>
+      <Item Name="[ref_count]" Condition="!is_empty()">header()->count</Item>
+      <Item Name="[flags]" Condition="!is_empty()">header()->flags</Item>
+      <Synthetic Name="[chars]" Condition="!is_empty()">
         <Expand>
           <ArrayItems>
-            <Size>__0->len</Size>
-            <ValuePointer>(char16_t*)__0->data</ValuePointer>
+            <Size>header()->len</Size>
+            <ValuePointer>(char16_t*)header()->data</ValuePointer>
           </ArrayItems>
         </Expand>
       </Synthetic>