From 50085e075fb044111e16785394b914cbe8a25030 Mon Sep 17 00:00:00 2001
From: Gregg Miskelly <greggm@microsoft.com>
Date: Wed, 5 Feb 2025 10:26:09 -0800
Subject: [PATCH] Fix bug in CChildVisualizer::GetItems

---
 CppCustomVisualizer/CppCustomVisualizer.ChildProcessDbgSettings | 2 +-
 .../CppCustomVisualizer.ChildProcessDbgSettings                 | 2 +-
 CppCustomVisualizer2/dll/ChildVisualizer.cpp                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CppCustomVisualizer/CppCustomVisualizer.ChildProcessDbgSettings b/CppCustomVisualizer/CppCustomVisualizer.ChildProcessDbgSettings
index 6297357..4b3d378 100644
--- a/CppCustomVisualizer/CppCustomVisualizer.ChildProcessDbgSettings
+++ b/CppCustomVisualizer/CppCustomVisualizer.ChildProcessDbgSettings
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ChildProcessDebuggingSettings IsEnabled="true" xmlns="http://schemas.microsoft.com/vstudio/ChildProcessDebuggingSettings/2014">
   <DefaultRule Attach="false" />
-  <Rule IsEnabled="true" ProcessName="msvsmon.exe" EngineFilter="[inherit]" />
+  <Rule IsEnabled="true" ProcessName="msvsmon.exe" CommandLine="" EngineFilter="[inherit]" />
 </ChildProcessDebuggingSettings>
\ No newline at end of file
diff --git a/CppCustomVisualizer2/CppCustomVisualizer.ChildProcessDbgSettings b/CppCustomVisualizer2/CppCustomVisualizer.ChildProcessDbgSettings
index 6297357..4b3d378 100644
--- a/CppCustomVisualizer2/CppCustomVisualizer.ChildProcessDbgSettings
+++ b/CppCustomVisualizer2/CppCustomVisualizer.ChildProcessDbgSettings
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ChildProcessDebuggingSettings IsEnabled="true" xmlns="http://schemas.microsoft.com/vstudio/ChildProcessDebuggingSettings/2014">
   <DefaultRule Attach="false" />
-  <Rule IsEnabled="true" ProcessName="msvsmon.exe" EngineFilter="[inherit]" />
+  <Rule IsEnabled="true" ProcessName="msvsmon.exe" CommandLine="" EngineFilter="[inherit]" />
 </ChildProcessDebuggingSettings>
\ No newline at end of file
diff --git a/CppCustomVisualizer2/dll/ChildVisualizer.cpp b/CppCustomVisualizer2/dll/ChildVisualizer.cpp
index 95ebcd0..2b65589 100644
--- a/CppCustomVisualizer2/dll/ChildVisualizer.cpp
+++ b/CppCustomVisualizer2/dll/ChildVisualizer.cpp
@@ -173,7 +173,7 @@ HRESULT CChildVisualizer::GetItems(
     {
         CString evalText;
 
-        UINT32 index = StartIndex + 1;
+        UINT32 index = StartIndex + i;
         VSAnalysisAssume(index < _countof(itemExprsPtr) && index < _countof(itemExprs) , "Should be impossible: already validated at start of function");
         if (m_fRootIsPointer)
         {