Skip to content

Guard island input site lookup during shutdown #11654

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

Open
Essam (TheBlueSky) wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

Guard island input site lookup during shutdown #11654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions dxaml/xcp/core/core/elements/depends.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ wrl::ComPtr<InputSiteHelper::IIslandInputSite> CDependencyObject::GetElementIsla
return spPopup->GetIslandInputSite();
}

if (coreServices->HasXamlIslandRoots())
if (coreServices && coreServices->HasXamlIslandRoots())
{
// If this element is in a XamlIslandRoot tree, return the IslandInputSite for that island.
auto root = coreServices->GetRootForElement(this);
Expand All @@ -329,7 +329,18 @@ wrl::ComPtr<InputSiteHelper::IIslandInputSite> CDependencyObject::GetElementIsla
}

// By default, return the primary IslandInputSite that was registered with InputServices on startup.
return coreServices->GetInputServices()->GetPrimaryRegisteredIslandInputSite();
// During shutdown the core services or the input services may already be torn down, in which case
// there is no island input site to return. Callers already treat a null result as "no input site" -
// see the _In_opt_ contract on CInputServices::GetUnderlyingInputHwndFromIslandInputSite.
if (coreServices)
{
if (auto inputServices = coreServices->GetInputServices())
{
return inputServices->GetPrimaryRegisteredIslandInputSite();
}
}

return nullptr;
}

HWND CDependencyObject::GetElementPositioningWindow()
Expand Down
Loading