From 4cd255801510d63139360d9fd620b3b68cfcc5d6 Mon Sep 17 00:00:00 2001
From: Tim Weis <tim.weis@outlook.com>
Date: Fri, 16 Feb 2024 19:34:10 +0100
Subject: [PATCH 1/6] mv

---
 crates/libs/core/{windows.natvis => natvis/windows-core.natvis} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename crates/libs/core/{windows.natvis => natvis/windows-core.natvis} (100%)

diff --git a/crates/libs/core/windows.natvis b/crates/libs/core/natvis/windows-core.natvis
similarity index 100%
rename from crates/libs/core/windows.natvis
rename to crates/libs/core/natvis/windows-core.natvis

From 6399bc4a82ec44534a1278518b960c93071a6706 Mon Sep 17 00:00:00 2001
From: Tim Weis <tim.weis@outlook.com>
Date: Fri, 16 Feb 2024 19:35:09 +0100
Subject: [PATCH 2/6] done

---
 crates/libs/core/natvis/windows-core.natvis | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/crates/libs/core/natvis/windows-core.natvis b/crates/libs/core/natvis/windows-core.natvis
index 5c3903a7d3e..f1a18ecf95e 100644
--- a/crates/libs/core/natvis/windows-core.natvis
+++ b/crates/libs/core/natvis/windows-core.natvis
@@ -11,17 +11,6 @@
     </Expand>
   </Type>
 
-  <Type Name="windows_result::error::Error">
-    <Expand>
-      <ExpandedItem>code</ExpandedItem>
-      <Item Name="[info]">info</Item>
-    </Expand>
-  </Type>
-
-  <Type Name="windows_result::hresult::HRESULT">
-    <DisplayString>{(HRESULT)__0}</DisplayString>
-  </Type>
-
   <Type Name="windows_core::imp::ref_count::RefCount">
     <DisplayString>{__0}</DisplayString>
   </Type>

From 94a553b4892dbc533776f335c79df2b22229fa01 Mon Sep 17 00:00:00 2001
From: Tim Weis <tim.weis@outlook.com>
Date: Fri, 16 Feb 2024 19:37:11 +0100
Subject: [PATCH 3/6] mv

---
 .../{core/windows.natvis => result/natvis/windows-result.natvis}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename crates/libs/{core/windows.natvis => result/natvis/windows-result.natvis} (100%)

diff --git a/crates/libs/core/windows.natvis b/crates/libs/result/natvis/windows-result.natvis
similarity index 100%
rename from crates/libs/core/windows.natvis
rename to crates/libs/result/natvis/windows-result.natvis

From 16a6eb491d42b6853a0f706b12460c1205b9c598 Mon Sep 17 00:00:00 2001
From: Tim Weis <tim.weis@outlook.com>
Date: Fri, 16 Feb 2024 19:37:51 +0100
Subject: [PATCH 4/6] done

---
 .../libs/result/natvis/windows-result.natvis  | 72 -------------------
 1 file changed, 72 deletions(-)

diff --git a/crates/libs/result/natvis/windows-result.natvis b/crates/libs/result/natvis/windows-result.natvis
index 5c3903a7d3e..0e6aa65e583 100644
--- a/crates/libs/result/natvis/windows-result.natvis
+++ b/crates/libs/result/natvis/windows-result.natvis
@@ -1,16 +1,4 @@
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="windows_core::array::Array&lt;*&gt;">
-    <DisplayString>{{ len={len} }}</DisplayString>
-
-    <Expand>
-      <Item Name="[len]">len</Item>
-      <ArrayItems>
-        <Size>len</Size>
-        <ValuePointer>data</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-
   <Type Name="windows_result::error::Error">
     <Expand>
       <ExpandedItem>code</ExpandedItem>
@@ -21,64 +9,4 @@
   <Type Name="windows_result::hresult::HRESULT">
     <DisplayString>{(HRESULT)__0}</DisplayString>
   </Type>
-
-  <Type Name="windows_core::imp::ref_count::RefCount">
-    <DisplayString>{__0}</DisplayString>
-  </Type>
-
-  <Type Name="windows_core::strings::hstring::HSTRING">
-    <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>
-
-    <Expand>
-      <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>header()->len</Size>
-            <ValuePointer>(char16_t*)header()->data</ValuePointer>
-          </ArrayItems>
-        </Expand>
-      </Synthetic>
-    </Expand>
-  </Type>
-
-  <Type Name="windows_core::strings::pstr::PSTR">
-    <AlternativeType Name="windows_core::strings::pcstr::PCSTR" />
-    <Intrinsic Name="len" Expression="strlen(((char*)__0))" />
-    <DisplayString>{(char*)__0,[len()]s8}</DisplayString>
-    <Expand>
-      <Item Name="[len]">len()</Item>
-      <Synthetic Name="[chars]">
-        <Expand>
-          <ArrayItems>
-            <Size>len()</Size>
-            <ValuePointer>(char*)__0</ValuePointer>
-          </ArrayItems>
-        </Expand>
-      </Synthetic>
-    </Expand>
-  </Type>
-
-  <Type Name="windows_core::strings::pwstr::PWSTR">
-    <AlternativeType Name="windows_core::strings::pcwstr::PCWSTR" />
-    <Intrinsic Name="len" Expression="wcslen(((WCHAR*)__0))" />
-    <DisplayString>{(char16_t*)__0,[len()]su}</DisplayString>
-
-    <Expand>
-      <Item Name="[len]">len()</Item>
-      <Synthetic Name="[chars]">
-        <Expand>
-          <ArrayItems>
-            <Size>len()</Size>
-            <ValuePointer>(char16_t*)__0</ValuePointer>
-          </ArrayItems>
-        </Expand>
-      </Synthetic>
-    </Expand>
-  </Type>
 </AutoVisualizer>

From 6f55dd2d29ce9ed35803ba6142357a5358fd844b Mon Sep 17 00:00:00 2001
From: Tim Weis <tim.weis@outlook.com>
Date: Fri, 16 Feb 2024 19:40:35 +0100
Subject: [PATCH 5/6] xml-ified

---
 crates/libs/core/natvis/windows-core.natvis     | 1 +
 crates/libs/result/natvis/windows-result.natvis | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/libs/core/natvis/windows-core.natvis b/crates/libs/core/natvis/windows-core.natvis
index f1a18ecf95e..d3a3630361c 100644
--- a/crates/libs/core/natvis/windows-core.natvis
+++ b/crates/libs/core/natvis/windows-core.natvis
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
   <Type Name="windows_core::array::Array&lt;*&gt;">
     <DisplayString>{{ len={len} }}</DisplayString>
diff --git a/crates/libs/result/natvis/windows-result.natvis b/crates/libs/result/natvis/windows-result.natvis
index 0e6aa65e583..0d373c2529b 100644
--- a/crates/libs/result/natvis/windows-result.natvis
+++ b/crates/libs/result/natvis/windows-result.natvis
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
   <Type Name="windows_result::error::Error">
     <Expand>

From 7e4e880384dade16aa602695e03bf41a3b5cab12 Mon Sep 17 00:00:00 2001
From: Tim Weis <tim.weis@outlook.com>
Date: Fri, 16 Feb 2024 19:42:55 +0100
Subject: [PATCH 6/6] associate

---
 crates/libs/core/src/lib.rs   | 2 +-
 crates/libs/result/src/lib.rs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/libs/core/src/lib.rs b/crates/libs/core/src/lib.rs
index 8d9d1f655a1..159cfbc2bcc 100644
--- a/crates/libs/core/src/lib.rs
+++ b/crates/libs/core/src/lib.rs
@@ -4,7 +4,7 @@ Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs
 
 #![doc(html_no_source)]
 #![allow(non_snake_case)]
-#![cfg_attr(windows_debugger_visualizer, debugger_visualizer(natvis_file = "../windows.natvis"))]
+#![cfg_attr(windows_debugger_visualizer, debugger_visualizer(natvis_file = "../natvis/windows-core.natvis"))]
 
 extern crate self as windows_core;
 
diff --git a/crates/libs/result/src/lib.rs b/crates/libs/result/src/lib.rs
index f39d6347364..3a04e61b2ed 100644
--- a/crates/libs/result/src/lib.rs
+++ b/crates/libs/result/src/lib.rs
@@ -2,6 +2,11 @@
 Learn more about Rust for Windows here: <https://github.com/microsoft/windows-rs>
 */
 
+#![cfg_attr(
+    windows_debugger_visualizer,
+    debugger_visualizer(natvis_file = "../natvis/windows-result.natvis")
+)]
+
 mod bindings;
 use bindings::*;