From 570e4ebc8d94de02b03be76c00f3d6bcfe5bab04 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Fri, 9 Feb 2024 14:24:04 -0800
Subject: [PATCH 1/2] Update natvis for cross-debugger compatibility

---
 crates/libs/core/windows.natvis | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/libs/core/windows.natvis b/crates/libs/core/windows.natvis
index d7dcabd321..29c6a2666c 100644
--- a/crates/libs/core/windows.natvis
+++ b/crates/libs/core/windows.natvis
@@ -27,10 +27,10 @@
   </Type>
 
   <Type Name="windows_core::strings::hstring::HSTRING">
-    <Intrinsic Name="header" Expression="*((windows_core::strings::hstring::Header**)this)" ReturnType="windows_core::strings::hstring::Header *" />
-    <Intrinsic Name="is_empty" Expression="header() == nullptr" />
+    <Intrinsic Name="header" Expression="(windows_core::strings::hstring::Header *)__0.tag" ReturnType="windows_core::strings::hstring::Header *" />
+    <Intrinsic Name="is_empty" Expression="__0.tag == 0" />
     <DisplayString Condition="is_empty()">""</DisplayString>
-    <DisplayString>{((char16_t*)header()->data),[header()->len]su}</DisplayString>
+    <DisplayString>{header()->data,[header()->len]su}</DisplayString>
 
     <Expand>
       <Item Name="[len]">is_empty() ? (unsigned int)0 : header()->len</Item>

From 3aacb8a74adc878cafd3ed55c1e2ea2247e2b355 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Sat, 10 Feb 2024 00:58:42 -0800
Subject: [PATCH 2/2] feedback

---
 crates/libs/core/windows.natvis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/libs/core/windows.natvis b/crates/libs/core/windows.natvis
index 29c6a2666c..32859b0a6c 100644
--- a/crates/libs/core/windows.natvis
+++ b/crates/libs/core/windows.natvis
@@ -27,7 +27,7 @@
   </Type>
 
   <Type Name="windows_core::strings::hstring::HSTRING">
-    <Intrinsic Name="header" Expression="(windows_core::strings::hstring::Header *)__0.tag" ReturnType="windows_core::strings::hstring::Header *" />
+    <Intrinsic Name="header" Expression="(windows_core::strings::hstring::Header *)__0.tag" />
     <Intrinsic Name="is_empty" Expression="__0.tag == 0" />
     <DisplayString Condition="is_empty()">""</DisplayString>
     <DisplayString>{header()->data,[header()->len]su}</DisplayString>