Skip to content

Fix user mode fonts to install & add repair support #6619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
David Bennett (dkbennett) wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix user mode fonts to install & add repair support #6619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f04c0f3
Fix user mode fonts to install the same way as machine fonts and add …
dkbennett Oct 23, 2026
400888c
Merge master into user/dkbennett/userfonts
dkbennett Oct 26, 2026
67898a5
Fix font layout test registry isolation
dkbennett Oct 26, 2026
80a846b
PR feedback and fixes
dkbennett Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix font layout test registry isolation 
Add a regression for volatile shared test keys and acknowledge fontlayout in the spelling dictionary.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: a9e21d38-9ab1-4358-963d-9aadad897ad0
  • Loading branch information
@dkbennett
dkbennett and Copilot committed Oct 26, 2026
commit 67898a5f21e1aa9e577e373a748d254c9dfff740
1 change: 1 addition & 0 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ FOF
FOLDERID
FONTCHANGE
FONTHASH
fontlayout
FORPARSING
foundfr
fsanitize
Expand Down
42 changes: 39 additions & 3 deletions src/AppInstallerCLITests/Fonts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,15 @@ namespace
struct FontLayoutTest
{
FontLayoutTest() :
RegistryPath(L"Software\\Microsoft\\WinGet\\FontLayoutTests\\" + Directory.GetPath().filename().wstring()),
RegistryHive(AppInstaller::Registry::Key::Create(HKEY_CURRENT_USER, RegistryPath)),
FontLayoutTest(AppInstaller::Registry::Key::OpenIfExists(HKEY_CURRENT_USER, std::wstring{}, 0, KEY_ALL_ACCESS))
{
}

explicit FontLayoutTest(AppInstaller::Registry::Key registryRoot) :
RegistryRoot(std::move(registryRoot)),
// Font registration keys require non-volatile ancestors.
RegistryPath(L"WinGetFontLayoutTests_" + Directory.GetPath().filename().wstring()),
RegistryHive(AppInstaller::Registry::Key::Create(RegistryRoot, RegistryPath)),
UserPath(AppInstaller::Runtime::GetPathDetailsFor(AppInstaller::Runtime::PathName::FontsUserInstallLocation)),
MachinePath(AppInstaller::Runtime::GetPathDetailsFor(AppInstaller::Runtime::PathName::FontsMachineInstallLocation))
{
Expand All @@ -40,7 +47,7 @@ namespace
TestHook_SetFontSessionChangesDisabled(false);
AppInstaller::Runtime::TestHook_SetPathOverride(AppInstaller::Runtime::PathName::FontsUserInstallLocation, UserPath);
AppInstaller::Runtime::TestHook_SetPathOverride(AppInstaller::Runtime::PathName::FontsMachineInstallLocation, MachinePath);
AppInstaller::Registry::Key::DeleteTree(HKEY_CURRENT_USER, RegistryPath);
AppInstaller::Registry::Key::DeleteTree(RegistryRoot, RegistryPath);
}

std::filesystem::path RootPath(ScopeEnum scope) const
Expand Down Expand Up @@ -93,6 +100,7 @@ namespace
}

TestCommon::TempDirectory Directory{ "FontLayout" };
AppInstaller::Registry::Key RegistryRoot;
std::wstring RegistryPath;
AppInstaller::Registry::Key RegistryHive;
AppInstaller::Filesystem::PathDetails UserPath;
Expand All @@ -118,6 +126,34 @@ namespace
}
}

TEST_CASE("FontLayout_InstallWithVolatileSharedTestTree", "[fonts][fontlayout]")
{
const auto scope = GENERATE(ScopeEnum::User, ScopeEnum::Machine);
const TempDirectory directory{ "FontRegistry" };
const auto registryPath = directory.GetPath().filename().wstring();
auto cleanup = wil::scope_exit([&]()
{
AppInstaller::Registry::Key::DeleteTree(HKEY_CURRENT_USER, registryPath);
});
auto registryRoot = AppInstaller::Registry::Key::Create(HKEY_CURRENT_USER, registryPath);
AppInstaller::Registry::Key::Create(registryRoot, L"Software\\Microsoft\\WinGet", REG_OPTION_VOLATILE);
REQUIRE_THROWS_HR(
AppInstaller::Registry::Key::Create(registryRoot, L"Software\\Microsoft\\WinGet\\FontLayoutTests"),
HRESULT_FROM_WIN32(ERROR_CHILD_MUST_BE_VOLATILE));

FontLayoutTest layout{ std::move(registryRoot) };
auto context = layout.Context(scope);
const auto source = layout.Directory.GetPath() / "Source" / s_FontFile;
const auto destination = layout.RootPath(scope) / s_FontFile;
layout.CopyFont(source);
context.AddPackageFile(source);
REQUIRE(InstallFontPackage(context).HResult == S_OK);
REQUIRE(RegistryString(layout.Package(context), L"TestFont.ttf") == destination.wstring());
REQUIRE(RegistryString(layout.Root(scope), L"TestFont.ttf") ==
(scope == ScopeEnum::Machine ? destination.filename().wstring() : destination.wstring()));
REQUIRE(UninstallFontPackage(context).HResult == S_OK);
}

TEST_CASE_METHOD(FontLayoutTest, "FontLayout_InstallRepairAndUninstall", "[fonts][fontlayout]")
{
const auto scope = GENERATE(ScopeEnum::User, ScopeEnum::Machine);
Expand Down
Loading