dev: full functional isolation host manager

seven-mile · Sep 16, 2023 · de12390 · de12390
1 parent 0611897
commit de12390
Show file tree

Hide file tree

Showing 38 changed files with 393 additions and 222 deletions.
diff --git a/UFCase.Host.Test/HostManager.cpp b/UFCase.Host.Test/HostManager.cpp
@@ -22,9 +22,11 @@ namespace winrt::UFCase::Isolation::implementation
                     .c_str());
         wprintf(winrt::format(L"\t{} {}\n", img.Architecture(), img.IsWinPE()).c_str());
 
-        for (auto obj : img.SxsStore().GetComponentCollection(L"HyperV-Worker-Control")) {
+        for (auto obj : img.SxsStore().GetComponentCollection(L"HyperV-Worker-Control"))
+        {
             auto comp = obj.as<Isolation::ComponentModel>();
-            wprintf(winrt::format(L"Component: {}\n\t{}\n", comp.TextForm(), comp.PayloadPath()).c_str());
+            wprintf(winrt::format(L"Component: {}\n\t{}\n", comp.TextForm(), comp.PayloadPath())
+                        .c_str());
         }
 
         host.Ping();

diff --git a/UFCase.Host.Test/HostManagerSingleton.cpp b/UFCase.Host.Test/HostManagerSingleton.cpp
@@ -9,4 +9,4 @@
 namespace winrt::UFCase::Isolation::implementation
 {
     CoCreatableCppWinRtClass(HostManagerSingleton);
-} // namespace winrt::UFCase::implementation
+} // namespace winrt::UFCase::Isolation::implementation
diff --git a/UFCase.Host/FeatureModel.cpp b/UFCase.Host/FeatureModel.cpp
@@ -92,7 +92,7 @@ namespace winrt::UFCase::Isolation::implementation
     {
         com_ptr<ICbsPackage> pPkg;
         check_hresult(GetInterface()->GetPackage(pPkg.put()));
-        if (auto self_pkg = m_package.get())
+        if (auto self_pkg = m_package)
         {
             auto pkg = make<implementation::PackageModel>(self_pkg.Session(), pPkg);
             return pkg;
@@ -113,7 +113,8 @@ namespace winrt::UFCase::Isolation::implementation
     Windows::Foundation::Collections::IVector<Isolation::FeatureModel> FeatureModel::
         GetParentFeatureCollection()
     {
-        constexpr HRESULT CBS_E_ARRAY_MISSING_INDEX = 0x800F0809, CBS_E_UNKNOWN_UPDATE = 0x800F080C;
+        constexpr HRESULT CBS_E_ARRAY_MISSING_INDEX = 0x800F0809, CBS_E_UNKNOWN_UPDATE = 0x800F080C,
+                          CBS_E_DUPLICATE_UPDATENAME = 0x800F0819;
         auto res = single_threaded_vector<Isolation::FeatureModel>();
         for (uint32_t idx = 0;; idx++)
         {
@@ -130,7 +131,7 @@ namespace winrt::UFCase::Isolation::implementation
 
             try
             {
-                res.Append(m_package.get().OpenFeature(ws_parent_name.get()));
+                res.Append(m_package.OpenFeature(ws_parent_name.get()));
             }
             catch (hresult_error const &hr)
             {
@@ -139,6 +140,17 @@ namespace winrt::UFCase::Isolation::implementation
                     // unknown update, ignore it
                     continue;
                 }
+                else if (hr.code() == CBS_E_DUPLICATE_UPDATENAME)
+                {
+                    // duplicate update name, fallback to enumeration
+                    for (auto upd : m_package.GetFeatureCollection(CbsApplicabilityApplicable,
+                                                         CbsSelectabilityAllClass)) {
+                        if (upd.Name() == ws_parent_name.get()) {
+                            res.Append(upd);
+                            break;
+                        }
+                    }
+                }
                 else
                 {
                     // rethrow

diff --git a/UFCase.Host/FeatureModel.h b/UFCase.Host/FeatureModel.h
@@ -8,7 +8,8 @@ namespace winrt::UFCase::Isolation::implementation
 {
     struct FeatureModel : FeatureModelT<FeatureModel>
     {
-        FeatureModel(Isolation::PackageModel pkg, com_ptr<ICbsUpdate> feature) : m_feature(feature)
+        FeatureModel(Isolation::PackageModel pkg, com_ptr<ICbsUpdate> feature)
+            : m_feature(feature), m_package(pkg)
         {
         }
 
@@ -30,7 +31,7 @@ namespace winrt::UFCase::Isolation::implementation
 
       private:
         com_ptr<ICbsUpdate> m_feature;
-        weak_ref<Isolation::PackageModel> m_package;
+        Isolation::PackageModel m_package;
         com_ptr<ICbsUpdate> GetInterface()
         {
             return m_feature;

diff --git a/UFCase.Host/SessionModel.h b/UFCase.Host/SessionModel.h
@@ -14,6 +14,15 @@ namespace winrt::UFCase::Isolation::implementation
             Initialize(option);
         }
 
+        ~SessionModel()
+        {
+            if (m_session)
+            {
+                _CbsRequiredAction ra;
+                check_hresult(m_session->Finalize(&ra));
+            }
+        }
+
         void AddSource(hstring const &source_dir);
         Windows::Foundation::IAsyncActionWithProgress<uint32_t> SaveChanges();
 

diff --git a/UFCase.Host/StoreModel.h b/UFCase.Host/StoreModel.h
@@ -34,10 +34,9 @@ namespace winrt::UFCase::Isolation::implementation
       public:
         Isolation::ComponentModel OpenComponent(hstring id);
 
-        Windows::Foundation::Collections::IIterable<IInspectable>
-        GetComponentCollection();
-        Windows::Foundation::Collections::IIterable<IInspectable>
-        GetComponentCollection(hstring ref_id);
+        Windows::Foundation::Collections::IIterable<IInspectable> GetComponentCollection();
+        Windows::Foundation::Collections::IIterable<IInspectable> GetComponentCollection(
+            hstring ref_id);
 
         com_ptr<IStore2> m_sxs_store;
         com_ptr<ICSIStore> m_csi_store;

diff --git a/UFCase.Host/main.cpp b/UFCase.Host/main.cpp
@@ -54,7 +54,13 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ LPWSTR, _In_ int)
 
     host_mgr.RegisterHost(host);
 
-    host_mgr.UnregisterHost(host);
+    // process messages, for long run
+    MSG msg{};
+    while (GetMessage(&msg, nullptr, 0, 0))
+    {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
 
     return 0;
 }
diff --git a/UFCase.WinMD.HostManager/HostManager.idl b/UFCase.WinMD.HostManager/HostManager.idl
@@ -104,7 +104,7 @@ namespace UFCase.Isolation
         Windows.Foundation.IAsyncActionWithProgress<UInt32> SaveChanges();
 
         PackageModel OpenPackage(String identity);
-        Windows.Foundation.Collections.IIterable<PackageModel> GetPackageCollection(
+        Windows.Foundation.Collections.IVector<PackageModel> GetPackageCollection(
             UInt32 option
         );
 

diff --git a/UFCase/App.xaml.h b/UFCase/App.xaml.h
@@ -2,6 +2,8 @@
 
 #include "App.xaml.g.h"
 
+#include "HostGuard.h"
+
 namespace winrt::UFCase::implementation
 {
     struct App : AppT<App>
@@ -13,6 +15,8 @@ namespace winrt::UFCase::implementation
       private:
         UFCase::MainWindow window{nullptr};
         UFCase::SplashWindow splash{nullptr};
+
+        HostGuard host_guard;
     };
 
 } // namespace winrt::UFCase::implementation
diff --git a/UFCase/ComponentViewModel.cpp b/UFCase/ComponentViewModel.cpp
@@ -8,8 +8,7 @@
 
 namespace winrt::UFCase::implementation
 {
-    ComponentViewModel::ComponentViewModel(uint64_t handle)
-        : m_model(ComponentModel::GetInstance(handle))
+    ComponentViewModel::ComponentViewModel(Isolation::ComponentModel model) : m_model(model)
     {
         Prefetch();
     }
@@ -26,9 +25,12 @@ namespace winrt::UFCase::implementation
 
     hstring ComponentViewModel::NameRaw()
     {
-        if (auto name = m_model.GetAttribute(L"Name"); name.empty()) {
+        if (auto name = m_model.GetAttribute(L"Name"); name.empty())
+        {
             return L"(unnamed)";
-        } else {
+        }
+        else
+        {
             return name;
         }
     }
@@ -67,15 +69,15 @@ namespace winrt::UFCase::implementation
     {
         switch (m_model.Status())
         {
-        case CSI_COMPONENT_STATUS_PRESTAGED:
+        case Isolation::CsiComponentStatus::Prestaged:
             return L"Prestaged";
-        case CSI_COMPONENT_STATUS_STAGED:
+        case Isolation::CsiComponentStatus::Staged:
             return L"Staged";
-        case CSI_COMPONENT_STATUS_PINNED:
+        case Isolation::CsiComponentStatus::Pinned:
             return L"Pinned";
-        case CSI_COMPONENT_STATUS_INSTALLED_MATCH:
+        case Isolation::CsiComponentStatus::Installed:
             return L"Installed";
-        case CSI_COMPONENT_STATUS_INSTALLED_MISMATCH:
+        case Isolation::CsiComponentStatus::InstalledMismatch:
             return L"InstalledMismatch";
         default:
             return L"Unknown";
@@ -91,20 +93,10 @@ namespace winrt::UFCase::implementation
     {
         auto result = multi_threaded_observable_vector<ComponentFileViewModel>();
 
-        auto flag_to_hstring = [](DWORD file_flag) {
-            switch (file_flag)
-            {
-            case STORE_ASSEMBLY_FILE_STATUS_FLAG_PRESENT:
-                return L"Present";
-            default:
-                return L"Unknown";
-            }
-        };
-
-        for (auto &f : m_model.Files())
+        for (auto f : m_model.GetFileCollection(ISTORE_ENUM_FILES_FLAG_INCLUDE_INSTALLED_FILES))
         {
-            result.Append(ComponentFileViewModel{.Name = f.pszFileName,
-                                                 .Status = flag_to_hstring(f.dwFileStatusFlags)});
+            result.Append(ComponentFileViewModel{.Name = f.Name,
+                                                 .Status = f.Status});
         }
 
         return result;

diff --git a/UFCase/ComponentViewModel.h b/UFCase/ComponentViewModel.h
@@ -2,7 +2,7 @@
 
 #include "ComponentViewModel.g.h"
 
-#include "ComponentModel.h"
+#include <winrt/UFCase.Isolation.h>
 
 #include "CacheUtil.h"
 #include "PropChgUtil.h"
@@ -12,7 +12,7 @@ namespace winrt::UFCase::implementation
     struct ComponentViewModel : ComponentViewModelT<ComponentViewModel>,
                                 ImplPropertyChangedT<ComponentViewModel>
     {
-        ComponentViewModel(uint64_t handle);
+        ComponentViewModel(Isolation::ComponentModel model);
 
         hstring TextFormRaw();
         hstring KeyFormRaw();
@@ -47,7 +47,7 @@ namespace winrt::UFCase::implementation
         // clang-format on
 
       private:
-        ComponentModel m_model;
+        Isolation::ComponentModel m_model;
 
         void Prefetch()
         {

diff --git a/UFCase/ComponentViewModel.idl b/UFCase/ComponentViewModel.idl
@@ -10,7 +10,7 @@ namespace UFCase
     [default_interface]
     runtimeclass ComponentViewModel : Microsoft.UI.Xaml.Data.INotifyPropertyChanged
     {
-        ComponentViewModel(UInt64 hModel);
+        ComponentViewModel(UFCase.Isolation.ComponentModel model);
 
         String TextForm{ get; };
         String KeyForm{ get; };

diff --git a/UFCase/ComponentsPageViewModel.cpp b/UFCase/ComponentsPageViewModel.cpp
@@ -4,8 +4,7 @@
 #include "ComponentsPageViewModel.g.cpp"
 #endif
 
-#include "StoreModel.h"
-#include "ComponentModel.h"
+#include <winrt/UFCase.Isolation.h>
 
 #include "AsyncUtil.h"
 #include "CbsUtil.h"
@@ -29,18 +28,19 @@ namespace winrt::UFCase::implementation
 
         m_components.Clear();
 
-        auto &store = StoreModel::GetInstance(m_image.Store());
+        auto store = m_image.Store();
 
-        auto comps = store.Components();
+        auto comps = store.GetComponentCollection();
 
         // if no reference restriction, estimate 10000 components
         // if there is reference restriction, this should be fast enough
         // and do not need a progress bar
         SIZE_T comps_count = 10000;
 
-        for (SIZE_T idx = 0; auto *comp : comps)
+        for (SIZE_T idx = 0; auto comp_ : comps)
         {
-            UFCase::ComponentViewModel comp_vm{comp->GetHandle()};
+            auto comp = comp_.as<Isolation::ComponentModel>();
+            UFCase::ComponentViewModel comp_vm{comp};
             RunUITask([=] { m_components.Append(comp_vm); });
 
             ++idx;

diff --git a/UFCase/FeatureViewModel.cpp b/UFCase/FeatureViewModel.cpp
@@ -7,8 +7,6 @@
 #include "FeatureViewModel.g.cpp"
 #endif
 
-#include "PackageModel.h"
-
 #include <winrt/Windows.Storage.Streams.h>
 
 #include "AsyncUtil.h"
@@ -20,7 +18,7 @@
 
 namespace winrt::UFCase::implementation
 {
-    FeatureViewModel::FeatureViewModel(uint64_t hModel) : m_model(FeatureModel::GetInstance(hModel))
+    FeatureViewModel::FeatureViewModel(Isolation::FeatureModel model) : m_model(model)
     {
         m_children.VectorChanged([self = get_strong()](auto const &, IVectorChangedEventArgs args) {
             switch (args.CollectionChange())
@@ -62,21 +60,21 @@ namespace winrt::UFCase::implementation
         auto state = m_model.RequestedState();
         switch (state)
         {
-        case CbsInstallStateInstallRequested:
-        case CbsInstallStateInstalled:
-            // case CbsInstallStatePermanent:
+        case Isolation::CbsInstallState::CbsInstallStateInstallRequested:
+        case Isolation::CbsInstallState::CbsInstallStateInstalled:
+            // case Isolation::CbsInstallState::CbsInstallStatePermanent:
             if (std::optional<bool> opt = this->IsChecked(); opt.has_value())
             {
                 assert(*opt);
                 return FeatureState::Enabled;
             }
             else
                 return FeatureState::PartiallyEnabled;
-        case CbsInstallStateUninstallRequested:
-        case CbsInstallStateStaged:
-            // case CbsInstallStateResolved:
+        case Isolation::CbsInstallState::CbsInstallStateUninstallRequested:
+        case Isolation::CbsInstallState::CbsInstallStateStaged:
+            // case Isolation::CbsInstallState::CbsInstallStateResolved:
             return FeatureState::Disabled;
-        case CbsInstallStateAbsent:
+        case Isolation::CbsInstallState::CbsInstallStateAbsent:
             return FeatureState::Unavailable;
         default:
             return FeatureState::Invalid;
@@ -124,14 +122,9 @@ namespace winrt::UFCase::implementation
         return m_model.SetMembership();
     }
 
-    UFCase::PackageViewModel FeatureViewModel::Package()
-    {
-        return UFCase::PackageViewModel(m_model.RawParentPackage()->GetHandle());
-    }
-
     UFCase::PackageViewModel FeatureViewModel::ContentPackage()
     {
-        return UFCase::PackageViewModel(m_model.RawFeaturePackage()->GetHandle());
+        return UFCase::PackageViewModel(m_model.ContentPackage());
     }
 
     FeatureViewModel::child_t FeatureViewModel::Children()
@@ -154,7 +147,7 @@ namespace winrt::UFCase::implementation
         }
         if (cnt < m_children.Size())
             return std::optional<bool>(std::nullopt);
-        if (m_model.RequestedState() >= CbsInstallStateInstallRequested)
+        if (static_cast<DWORD>(m_model.RequestedState()) >= CbsInstallStateInstallRequested)
             return true;
         return false;
     }