Unify all resolvers to use the helper function

Author: DHowett

src/cascadia/TerminalApp/Jumplist.cpp

@@ -45,13 +45,12 @@ static constexpr bool _isProbableFilePath(std::wstring_view path)
 //   paths to have the "correct" slash direction.
 static std::wstring _normalizeIconPath(std::wstring_view path)
 {
-    const auto fullPath{ wil::ExpandEnvironmentStringsW<std::wstring>(path.data()) };
-    if (_isProbableFilePath(fullPath))
+    if (_isProbableFilePath(path))
     {
-        std::filesystem::path asPath{ fullPath };
+        std::filesystem::path asPath{ path };
         return asPath.make_preferred().wstring();
     }
-    return std::wstring{ fullPath };
+    return std::wstring{ path };
 }
 
 // Method Description:

src/cascadia/TerminalSettingsModel/ActionEntry.cpp

@@ -52,7 +52,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         if (!_Icon.empty())
         {
-            resolver(basePath, winrt::make<ThingResource>(_Icon));
+            ResolveMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
         }
     }
 }

src/cascadia/TerminalSettingsModel/AppearanceConfig.cpp

@@ -153,20 +153,17 @@ void AppearanceConfig::ResolveMediaResources(const Model::MediaResourceResolver&
     if (const auto [source, path] = _getBackgroundImagePathOverrideSourceAndValueImpl(); source && path && !path->empty())
     {
         winrt::hstring sourceBasePath{ source->_getSourceProfileBasePath() };
-        auto tr{ winrt::make_self<ThingResource>(*path) };
-        resolver(sourceBasePath, *tr);
+        ResolveMediaResourceIntoPath(sourceBasePath, *path, resolver, _backgroundImagePath);
     }
     if (const auto [source, path]{ _getPixelShaderPathOverrideSourceAndValueImpl() }; source && path && !path->empty())
     {
         winrt::hstring sourceBasePath{ source->_getSourceProfileBasePath() };
-        auto tr{ winrt::make_self<ThingResource>(*path) };
-        resolver(sourceBasePath, *tr);
+        ResolveMediaResourceIntoPath(sourceBasePath, *path, resolver, _pixelShaderPath);
     }
     if (const auto [source, path]{ _getPixelShaderImagePathOverrideSourceAndValueImpl() }; source && path && !path->empty())
     {
         winrt::hstring sourceBasePath{ source->_getSourceProfileBasePath() };
-        auto tr{ winrt::make_self<ThingResource>(*path) };
-        resolver(sourceBasePath, *tr);
+        ResolveMediaResourceIntoPath(sourceBasePath, *path, resolver, _pixelShaderImagePath);
     }
 }
 

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp

@@ -488,7 +488,7 @@ void CascadiaSettings::_validateAllSchemesExist()
     }
 }
 
-static void _resolveSingleMediaResource(std::wstring_view basePath, const Model::IMediaResource& resource)
+void CascadiaSettings::_resolveSingleMediaResource(Model::OriginTag /*origin*/, std::wstring_view basePath, const Model::IMediaResource& resource)
 {
     auto resourcePath{ resource.Path() };
 
@@ -597,9 +597,7 @@ void CascadiaSettings::_validateMediaResources()
     auto warnInvalidBackground{ false };
     auto warnInvalidIcon{ false };
 
-    winrt::Microsoft::Terminal::Settings::Model::MediaResourceResolver mediaResourceResolver{
-        &_resolveSingleMediaResource
-    };
+    MediaResourceResolver mediaResourceResolver{ this, &CascadiaSettings::_resolveSingleMediaResource };
 
     for (const auto& profile : _allProfiles)
     {

src/cascadia/TerminalSettingsModel/CascadiaSettings.h

@@ -210,6 +210,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         void _validateSettings();
         void _validateAllSchemesExist();
+        void _resolveSingleMediaResource(Model::OriginTag origin, std::wstring_view basePath, const Model::IMediaResource& resource);
         void _validateMediaResources();
         void _validateProfileEnvironmentVariables();
         void _validateKeybindings() const;

src/cascadia/TerminalSettingsModel/Command.cpp

@@ -593,7 +593,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     void Command::ResolveMediaResourcesWithBasePath(const winrt::hstring& basePath, const Model::MediaResourceResolver& resolver)
     {
         if (_iconPath && !_iconPath->empty())
-            resolver(basePath, winrt::make<ThingResource>(winrt::hstring{ *_iconPath }));
+        {
+            ResolveMediaResourceIntoPath(basePath, hstring{ *_iconPath }, resolver, _resolvedIcon);
+        }
     }
 
     winrt::Windows::Foundation::Collections::IVector<Model::Command> Command::ParsePowerShellMenuComplete(winrt::hstring json, int32_t replaceLength)

src/cascadia/TerminalSettingsModel/ProfileEntry.cpp

@@ -77,7 +77,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         if (!_Icon.empty())
         {
-            resolver(basePath, winrt::make<ThingResource>(_Icon));
+            ResolveMediaResourceIntoPath(basePath, _Icon, resolver, _resolvedIcon);
         }
     }
 }