Merge branch 'dev/migrie/f/non-terminal-content-elevation-warning' into dev/migrie/f/632-on-warning-dialog
This commit is contained in:
commit
3d41cba497
1
.github/actions/spelling/allow/apis.txt
vendored
1
.github/actions/spelling/allow/apis.txt
vendored
|
@ -131,6 +131,7 @@ RETURNCMD
|
|||
rfind
|
||||
roundf
|
||||
RSHIFT
|
||||
SACL
|
||||
schandle
|
||||
semver
|
||||
serializer
|
||||
|
|
1
.github/actions/spelling/allow/names.txt
vendored
1
.github/actions/spelling/allow/names.txt
vendored
|
@ -9,6 +9,7 @@ Diviness
|
|||
dsafa
|
||||
duhowett
|
||||
ekg
|
||||
eryksun
|
||||
ethanschoonover
|
||||
Firefox
|
||||
Gatta
|
||||
|
|
|
@ -898,7 +898,7 @@ namespace winrt::TerminalApp::implementation
|
|||
// try to persist the actions in the window state, we won't be
|
||||
// able to. We'll try to look up the action and the map just
|
||||
// won't exist. We'll explode, even though the Terminal is
|
||||
// tearing down anyways. So we'll just die, but still inboke
|
||||
// tearing down anyways. So we'll just die, but still invoke
|
||||
// WinDBG's post-mortem debugger, who won't be able to attach to
|
||||
// the process that's already exiting.
|
||||
//
|
||||
|
|
|
@ -1668,7 +1668,7 @@ namespace winrt::TerminalApp::implementation
|
|||
{
|
||||
// NOTE: For debugging purposes, changing this to `true || IsElevated()`
|
||||
// is a handy way of forcing the elevation logic, even when unelevated.
|
||||
if (true || IsElevated())
|
||||
if (IsElevated())
|
||||
{
|
||||
// If the cmdline is EXACTLY an executable in
|
||||
// `C:\WINDOWS\System32`, then ignore this check.
|
||||
|
|
|
@ -76,9 +76,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model
|
|||
THROW_IF_WIN32_BOOL_FALSE(
|
||||
ConvertStringSidToSidW(L"BA", wil::out_param_ptr<PSID*>(psidAdmins)));
|
||||
|
||||
// Compare the owner SID to the administrators SID via
|
||||
// EqualSid(psidOwner, psidAdmins). This does a low-level memory
|
||||
// comparison of the SIDs.
|
||||
return EqualSid(psidOwner, psidAdmins.get());
|
||||
}
|
||||
// Tries to read a file somewhat atomically without locking it.
|
||||
|
|
Loading…
Reference in a new issue