From 329b104182f7837538c6f779d14e51ba98baf0ef Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Mon, 14 Dec 2020 21:02:28 -0800
Subject: [PATCH] Standalone and Component Visualizers/VSIXes (#823)

* Revert "Remove visualizer from vsix (#792)"

This reverts commit d4635e3bb5add242c117c1bca0308ee131ef8932.

* Reenabled standalone visualizer and forked component visualizer for VS installer integration

* build component and standalone visualizers
---
 build_test_all.cmd                 |   3 +-
 build_vsix.cmd                     |   9 ++++-
 natvis/cppwinrtvisualizer.vcxproj  |  21 ++++++-----
 natvis/object_visualizer.cpp       |  56 ++++++++++++++++++++++++++---
 vsix/UpgradeLog.htm                | Bin 31708 -> 0 bytes
 vsix/source.extension.vsixmanifest |   2 ++
 vsix/vsix.csproj                   |  40 ++++++++++-----------
 7 files changed, 96 insertions(+), 35 deletions(-)
 delete mode 100644 vsix/UpgradeLog.htm

diff --git a/build_test_all.cmd b/build_test_all.cmd
index 50aab9b2..4529372f 100644
--- a/build_test_all.cmd
+++ b/build_test_all.cmd
@@ -22,7 +22,8 @@ if "%target_platform%"=="arm64" goto :eof
 
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
 _build\%target_platform%\%target_configuration%\cppwinrt.exe -in local -out _build\%target_platform%\%target_configuration% -verbose
-call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
+call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,Deployment=Component;CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
+call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,Deployment=Standalone;CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
 call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% test\nuget\NugetTest.sln
 
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test
diff --git a/build_vsix.cmd b/build_vsix.cmd
index 265c7c67..bfb47e23 100644
--- a/build_vsix.cmd
+++ b/build_vsix.cmd
@@ -3,14 +3,17 @@
 set this_dir=%~dp0
 set target_configuration=%1
 set target_version=%2
+set target_deployment=%3
 
 if "%target_configuration%"=="" set target_configuration=Release
 if "%target_version%"=="" set target_version=1.2.3.4
+if "%target_deployment%"=="" set target_deployment=Standalone
 
 if not exist ".\.nuget" mkdir ".\.nuget"
 if not exist ".\.nuget\nuget.exe" powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile .\.nuget\nuget.exe"
 
 call .nuget\nuget.exe restore cppwinrt.sln"
+call .nuget\nuget.exe restore natvis\cppwinrtvisualizer.sln
 call .nuget\nuget.exe restore test\nuget\NugetTest.sln
 
 rem Build fast forwarder libs or all arches
@@ -22,8 +25,12 @@ call msbuild /m /p:Configuration=%target_configuration%,Platform=arm64,CppWinRTB
 rem Build cppwinrt.exe for x86 only
 call msbuild /m /p:Configuration=%target_configuration%,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
 
+rem Build cppwinrt visualizer dll for x86 and x64
+call msbuild /p:Configuration=%target_configuration%,Platform=x64,Deployment=%target_deployment%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
+call msbuild /p:Configuration=%target_configuration%,Platform=x86,Deployment=%target_deployment%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
+
 rem Build nuget 
 .nuget\nuget.exe pack nuget\Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory %this_dir%_build -Properties Configuration=%target_configuration%;cppwinrt_exe=%this_dir%_build\x86\%target_configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%this_dir%_build\x86\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%this_dir%_build\x64\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%this_dir%_build\arm\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%this_dir%_build\arm64\%target_configuration%\cppwinrt_fast_forwarder.lib  -version %target_version% -Verbosity Detailed
 
 rem Build vsix
-call msbuild /p:Configuration=%target_configuration%,Platform=x86,CppWinRTVersion=%target_version%,NupkgDir=%this_dir%_build vsix\vsix.sln
+call msbuild /p:Configuration=%target_configuration%,Platform=x86,Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln
diff --git a/natvis/cppwinrtvisualizer.vcxproj b/natvis/cppwinrtvisualizer.vcxproj
index 6fb31734..72d68340 100644
--- a/natvis/cppwinrtvisualizer.vcxproj
+++ b/natvis/cppwinrtvisualizer.vcxproj
@@ -77,23 +77,23 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>x86\$(Configuration)\</OutDir>
-    <IntDir>x86\$(Configuration)\</IntDir>
+    <OutDir>x86\$(Configuration)\$(Deployment)\</OutDir>
+    <IntDir>x86\$(Configuration)\$(Deployment)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>x64\$(Configuration)\</OutDir>
-    <IntDir>x64\$(Configuration)\</IntDir>
+    <OutDir>x64\$(Configuration)\$(Deployment)\</OutDir>
+    <IntDir>x64\$(Configuration)\$(Deployment)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>x86\$(Configuration)\</OutDir>
-    <IntDir>x86\$(Configuration)\</IntDir>
+    <OutDir>x86\$(Configuration)\$(Deployment)\</OutDir>
+    <IntDir>x86\$(Configuration)\$(Deployment)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>x64\$(Configuration)\</OutDir>
-    <IntDir>x64\$(Configuration)\</IntDir>
+    <OutDir>x64\$(Configuration)\$(Deployment)\</OutDir>
+    <IntDir>x64\$(Configuration)\$(Deployment)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -204,6 +204,11 @@
       <DelayLoadDLLs>vsdebugeng.dll</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Deployment)'=='Component'">
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions) /DCOMPONENT_DEPLOYMENT</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="object_visualizer.h" />
     <ClInclude Include="cppwinrt_visualizer.h" />
diff --git a/natvis/object_visualizer.cpp b/natvis/object_visualizer.cpp
index b26e9108..9b9352f5 100644
--- a/natvis/object_visualizer.cpp
+++ b/natvis/object_visualizer.cpp
@@ -211,9 +211,14 @@ static HRESULT ObjectToString(
     _In_ DkmVisualizedExpression* pExpression,
     _In_ DkmPointerValueHome* pObject,
     bool isAbiObject,
-    _Out_ com_ptr<DkmString>& pValue
+    _Out_ com_ptr<DkmString>& pValue,
+    bool* unavailable = nullptr
 )
 {
+    if (unavailable) 
+    {
+        *unavailable = false;
+    }
     if (SUCCEEDED(EvaluatePropertyString({ IID_IStringable, 0, PropertyCategory::String }, pExpression, pObject, isAbiObject, pValue)))
     {
         if (pValue && pValue->Length() > 0)
@@ -232,6 +237,10 @@ static HRESULT ObjectToString(
 
     // VirtualQuery validation failed (as determined by no runtime class name) or an
     // exception escaped WINRT_abi_val (e.g, bad pointer, which we try to avoid via VirtualQuery)
+    if (unavailable)
+    {
+        *unavailable = true;
+    }
     return DkmString::Create(L"<Object uninitialized or information unavailable>", pValue.put());
 }
 
@@ -534,18 +543,55 @@ HRESULT object_visualizer::CreateEvaluationResult(_In_ DkmVisualizedExpression*
     return S_OK;
 }
 
+#ifdef COMPONENT_DEPLOYMENT
+static std::set<UINT64> g_refresh_cache;
+bool requires_refresh(UINT64 address, DkmEvaluationFlags_t evalFlags)
+{
+    auto refreshed = g_refresh_cache.find(address) != g_refresh_cache.end();
+    return !refreshed && ((evalFlags & DkmEvaluationFlags::EnableExtendedSideEffects) != DkmEvaluationFlags::EnableExtendedSideEffects);
+}
+void cache_refresh(UINT64 address)
+{
+    g_refresh_cache.insert(address);
+}
+#else
+bool requires_refresh(UINT64, DkmEvaluationFlags_t)
+{
+    return false;
+}
+void cache_refresh(UINT64)
+{
+}
+#endif
+
 HRESULT object_visualizer::CreateEvaluationResult(_Deref_out_ DkmEvaluationResult** ppResultObject)
 {
     com_ptr<DkmRootVisualizedExpression> pRootVisualizedExpression = m_pVisualizedExpression.as<DkmRootVisualizedExpression>();
 
     auto valueHome = make_com_ptr(m_pVisualizedExpression->ValueHome());
     com_ptr<DkmPointerValueHome> pPointerValueHome = valueHome.as<DkmPointerValueHome>();
-
+    auto address = pPointerValueHome->Address();
+    
     com_ptr<DkmString> pValue;
-    IF_FAIL_RET(ObjectToString(m_pVisualizedExpression.get(), pPointerValueHome.get(), m_isAbiObject, pValue));
+    DkmEvaluationResultFlags_t evalResultFlags = DkmEvaluationResultFlags::ReadOnly;
+    if (requires_refresh(address, m_pVisualizedExpression->InspectionContext()->EvaluationFlags()))
+    {
+        IF_FAIL_RET(DkmString::Create(L"<Refresh to view properties>", pValue.put()));
+        evalResultFlags |= DkmEvaluationResultFlags::EnableExtendedSideEffectsUponRefresh | DkmEvaluationResultFlags::CanEvaluateNow;
+    }
+    else
+    {
+        cache_refresh(address);
+        bool unavailable;
+        IF_FAIL_RET(ObjectToString(m_pVisualizedExpression.get(), pPointerValueHome.get(), m_isAbiObject, pValue, &unavailable));
+        if (!unavailable)
+        {
+            evalResultFlags |= DkmEvaluationResultFlags::Expandable;
+        }
+    }
 
     com_ptr<DkmDataAddress> pAddress;
-    IF_FAIL_RET(DkmDataAddress::Create(m_pVisualizedExpression->StackFrame()->RuntimeInstance(), pPointerValueHome->Address(), nullptr, pAddress.put()));
+    IF_FAIL_RET(DkmDataAddress::Create(m_pVisualizedExpression->StackFrame()->RuntimeInstance(), address, nullptr, pAddress.put()));
 
     com_ptr<DkmSuccessEvaluationResult> pSuccessEvaluationResult;
     IF_FAIL_RET(DkmSuccessEvaluationResult::Create(
@@ -553,7 +599,7 @@ HRESULT object_visualizer::CreateEvaluationResult(_Deref_out_ DkmEvaluationResul
         m_pVisualizedExpression->StackFrame(),
         pRootVisualizedExpression->Name(),
         pRootVisualizedExpression->FullName(),
-        DkmEvaluationResultFlags::Expandable | DkmEvaluationResultFlags::ReadOnly,
+        evalResultFlags,
         pValue.get(),
         pValue.get(),
         pRootVisualizedExpression->Type(),
diff --git a/vsix/UpgradeLog.htm b/vsix/UpgradeLog.htm
deleted file mode 100644
index df1295ddad40fc4f2536c1e0654eff5b36931d96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31708
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
M*~{=x((j`G11Tig8vp<R

diff --git a/vsix/source.extension.vsixmanifest b/vsix/source.extension.vsixmanifest
index d40afde5..4dc229ae 100644
--- a/vsix/source.extension.vsixmanifest
+++ b/vsix/source.extension.vsixmanifest
@@ -22,6 +22,8 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
+    <Asset Type="NativeVisualizer" Path="cppwinrt.natvis" />
+    <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
     <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
diff --git a/vsix/vsix.csproj b/vsix/vsix.csproj
index d0536f3d..9279dee1 100644
--- a/vsix/vsix.csproj
+++ b/vsix/vsix.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>bin\x86\Debug\$(Deployment)\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -17,7 +17,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
+    <OutputPath>bin\x86\Release\$(Deployment)\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -46,24 +46,6 @@
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\$(Deployment)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\$(Deployment)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <ItemGroup>
     <Content Include="LICENSE">
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -108,6 +90,22 @@
       <Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="..\natvis\cppwinrt.natvis">
+      <Link>%(Filename)%(Extension)</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="$(NatvisDirx86)\cppwinrtvisualizer.vsdconfig">
+      <Link>%(Filename)%(Extension)</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="$(NatvisDirx86)\cppwinrtvisualizer.dll">
+      <Link>x86\%(Filename)%(Extension)</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="$(NatvisDirx64)\cppwinrtvisualizer.dll">
+      <Link>x64\%(Filename)%(Extension)</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -139,6 +137,8 @@
   <Target Name="GetCppWinRTVersion" Outputs="$(CppWinRTVersion)" />
   <Target Name="PrepareBuild" BeforeTargets="PrepareForBuild">
     <Error Condition="'$(CppWinRTVersion)' == ''" Text="The project must be supplied with a CppWinRTVersion property value" />
+    <Error Condition="'$(NatvisDirx86)' == ''" Text="The project must be supplied with a NatvisDirx86 property value" />
+    <Error Condition="'$(NatvisDirx64)' == ''" Text="The project must be supplied with a NatvisDirx64 property value" />
     <Error Condition="'$(NupkgDir)' == ''" Text="The project must be supplied with a NupkgDir property value" />
     <Copy SourceFiles="..\LICENSE" DestinationFolder="$(MSBuildProjectDirectory)" />
     <ItemGroup>