haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check HKCU before HKLM for registry policies

This commit is contained in:
Marek Roszko 2022-04-12 21:40:39 -04:00
parent 184b67098f
commit c64ea07d0b
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/kiplatform/msw/policy.cpp
View File

@ -28,11 +28,27 @@
KIPLATFORM::POLICY::STATE KIPLATFORM::POLICY::GetPolicyState( const wxString& aKey ) KIPLATFORM::POLICY::STATE KIPLATFORM::POLICY::GetPolicyState( const wxString& aKey )
{ {
wxRegKey key( wxRegKey::HKLM, POLICY_KEY_ROOT ); wxRegKey* keyToUse = nullptr;
if( key.Exists() ) wxRegKey userKey( wxRegKey::HKCU, POLICY_KEY_ROOT );
wxRegKey compKey( wxRegKey::HKLM, POLICY_KEY_ROOT );
// we have user level policies take precedence over computer level policies
if( userKey.Exists() && userKey.HasValue( aKey ) )
{
keyToUse = &userKey;
}
else
{
if( compKey.Exists() && compKey.HasValue( aKey ) )
{
keyToUse = &compKey;
}
}
if( keyToUse != nullptr )
{ {
long value; long value;
if( key.HasValue( aKey ) && key.QueryValue( aKey, &value ) ) if( keyToUse->QueryValue( aKey, &value ) )
{ {
if( value == 1 ) if( value == 1 )
return POLICY::STATE::ENABLED; return POLICY::STATE::ENABLED;