From 58eef2411d8f2a5456649022daef36282a3de1a6 Mon Sep 17 00:00:00 2001
From: George Tokmaji <tokmajigeorge@gmail.com>
Date: Thu, 22 May 2025 14:21:03 +0200
Subject: [PATCH 1/2] Fix crash due to static weak pointer referencing an
 object in an unloaded DLL

Based on https://devblogs.microsoft.com/oldnewthing/20210215-00/
---
 .../PredefinedInstalledSourceFactory.cpp      | 51 ++++++++++++++++---
 src/AppInstallerRepositoryCore/pch.h          |  6 ++-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp b/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
index 3f0dd03471..38a15f003a 100644
--- a/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
+++ b/src/AppInstallerRepositoryCore/Microsoft/PredefinedInstalledSourceFactory.cpp
@@ -262,6 +262,43 @@ namespace AppInstaller::Repository::Microsoft
 
         struct CachedInstalledIndex
         {
+            // https://devblogs.microsoft.com/oldnewthing/20210215-00/?p=104865
+            struct Singleton
+            {
+                struct Holder : public winrt::implements<Holder, winrt::Windows::Foundation::IInspectable>
+                {
+                    static constexpr std::wstring_view Guid{ L"{48c47064-4fff-4eca-812c-dbb4f33a8fcb}" };
+                    std::shared_ptr<CachedInstalledIndex> m_shared{ std::make_shared<CachedInstalledIndex>() };
+                };
+
+                std::weak_ptr<CachedInstalledIndex> m_weak;
+                winrt::slim_mutex m_lock;
+
+                std::shared_ptr<CachedInstalledIndex> Get()
+                {
+                    {
+                        const std::shared_lock lock{ m_lock };
+                        if (auto cachedIndex = m_weak.lock())
+                        {
+                            return cachedIndex;
+                        }
+                    }
+
+                    auto value = winrt::make_self<Holder>();
+
+                    const std::shared_lock lock{ m_lock };
+                    if (auto cachedIndex = m_weak.lock())
+                    {
+                        return cachedIndex;
+                    }
+
+                    winrt::Windows::ApplicationModel::Core::CoreApplication::Properties().Insert(Holder::Guid, value.as<winrt::Windows::Foundation::IInspectable>());
+
+                    m_weak = value->m_shared;
+                    return value->m_shared;
+                }
+            };
+
             CachedInstalledIndex()
             {
                 ARPHelper arpHelper;
@@ -340,7 +377,7 @@ namespace AppInstaller::Repository::Microsoft
 
                 if (PredefinedInstalledSourceFactory::StringToFilter(m_details.Arg) == PredefinedInstalledSourceFactory::Filter::NoneWithForcedCacheUpdate)
                 {
-                    GetCachedInstalledIndex().ForceNextUpdate();
+                    GetCachedInstalledIndex()->ForceNextUpdate();
                 }
             }
 
@@ -359,9 +396,9 @@ namespace AppInstaller::Repository::Microsoft
                 // Only cache for the unfiltered install data
                 if (filter == PredefinedInstalledSourceFactory::Filter::None || filter == PredefinedInstalledSourceFactory::Filter::NoneWithForcedCacheUpdate)
                 {
-                    CachedInstalledIndex& cachedIndex = GetCachedInstalledIndex();
-                    cachedIndex.UpdateIndexIfNeeded();
-                    return std::make_shared<SQLiteIndexSource>(m_details, cachedIndex.GetCopy(), true);
+                    std::shared_ptr<CachedInstalledIndex> cachedIndex = GetCachedInstalledIndex();
+                    cachedIndex->UpdateIndexIfNeeded();
+                    return std::make_shared<SQLiteIndexSource>(m_details, cachedIndex->GetCopy(), true);
                 }
                 else
                 {
@@ -370,10 +407,10 @@ namespace AppInstaller::Repository::Microsoft
             }
 
         private:
-            CachedInstalledIndex& GetCachedInstalledIndex()
+            std::shared_ptr<CachedInstalledIndex> GetCachedInstalledIndex()
             {
-                static CachedInstalledIndex s_installedIndex;
-                return s_installedIndex;
+                static CachedInstalledIndex::Singleton s_installedIndex;
+                return s_installedIndex.Get();
             }
 
             SourceDetails m_details;
diff --git a/src/AppInstallerRepositoryCore/pch.h b/src/AppInstallerRepositoryCore/pch.h
index 753bb07340..1fe0660b64 100644
--- a/src/AppInstallerRepositoryCore/pch.h
+++ b/src/AppInstallerRepositoryCore/pch.h
@@ -21,7 +21,8 @@
 
 #include <winsqlite/winsqlite3.h>
 
-#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.Core.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Management.Deployment.h>
@@ -41,7 +42,8 @@
 #include <memory>
 #include <optional>
 #include <random>
-#include <set>
+#include <set>
+#include <shared_mutex>
 #include <string>
 #include <string_view>
 #include <sstream>

From 1d75f5e8ae3a97aa99b35ab0230f4c742a8b795d Mon Sep 17 00:00:00 2001
From: JohnMcPMS <johnmcp@microsoft.com>
Date: Thu, 22 May 2025 09:29:10 -0700
Subject: [PATCH 2/2] Update expect.txt

---
 .github/actions/spelling/expect.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 26783b81aa..322ba30cd1 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -123,6 +123,7 @@ deliveryoptimization
 deliveryoptimizationerrors
 DENYWR
 desktopappinstaller
+devblogs
 devhome
 DFX
 dic