DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to use policy manager apis for detecting graphing policy (#1426)

Browse Source 
* switch to use policy manager apis for detecting graphing policy

* Remove RegGetValueW from NavCategory.cpp since it is no longer used.
This commit is contained in:
Stephanie Anderl 2020-11-05 15:08:39 -08:00 committed by GitHub
parent e6b30fa295
commit 15ae66626a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/CalcViewModel/Common/NavCategory.cpp
View File

@ -9,10 +9,13 @@
using namespace CalculatorApp; using namespace CalculatorApp;
using namespace CalculatorApp::Common; using namespace CalculatorApp::Common;
using namespace Concurrency;
using namespace Platform; using namespace Platform;
using namespace Platform::Collections; using namespace Platform::Collections;
using namespace std; using namespace std;
using namespace Windows::Foundation::Collections; using namespace Windows::Foundation::Collections;
using namespace Windows::Management::Policies;
using namespace Windows::System;
namespace UCM = UnitConversionManager; namespace UCM = UnitConversionManager;
@ -50,22 +53,6 @@ wchar_t* towchar_t(int number)
return _wcsdup(wstr.c_str()); return _wcsdup(wstr.c_str());
} }
extern "C"
{
WINADVAPI LSTATUS APIENTRY RegGetValueW(
_In_ HKEY hkey,
_In_opt_ LPCWSTR lpSubKey,
_In_opt_ LPCWSTR lpValue,
_In_ DWORD dwFlags,
_Out_opt_ LPDWORD pdwType,
_When_(
(dwFlags & 0x7F) == RRF_RT_REG_SZ || (dwFlags & 0x7F) == RRF_RT_REG_EXPAND_SZ || (dwFlags & 0x7F) == (RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ)
|| *pdwType == REG_SZ || *pdwType == REG_EXPAND_SZ,
_Post_z_) _When_((dwFlags & 0x7F) == RRF_RT_REG_MULTI_SZ || *pdwType == REG_MULTI_SZ, _Post_ _NullNull_terminated_)
_Out_writes_bytes_to_opt_(*pcbData, *pcbData) PVOID pvData,
_Inout_opt_ LPDWORD pcbData);
}
bool IsGraphingModeAvailable() bool IsGraphingModeAvailable()
{ {
static bool supportGraph = Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath"); static bool supportGraph = Windows::Foundation::Metadata::ApiInformation::IsMethodPresent("Windows.UI.Text.RichEditTextDocument", "GetMath");
@ -85,25 +72,12 @@ bool IsGraphingModeEnabled()
return _isGraphingModeEnabledCached->Value; return _isGraphingModeEnabledCached->Value;
} }
DWORD allowGraphingCalculator{ 0 }; User ^ firstUser;
DWORD bufferSize{ sizeof(allowGraphingCalculator) }; create_task(User::FindAllAsync(UserType::LocalUser)).then([&firstUser](IVectorView<User ^> ^ users) {
// Make sure to call RegGetValueW only on Windows 10 1903+ firstUser = users->GetAt(0); }).wait();
if (RegGetValueW( auto namedPolicyData = NamedPolicy::GetPolicyFromPathForUser(firstUser, L"Education", L"AllowGraphingCalculator");
HKEY_CURRENT_USER, _isGraphingModeEnabledCached = namedPolicyData->GetBoolean() == true;
L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Calculator",
L"AllowGraphingCalculator",
RRF_RT_DWORD, // RRF_RT_DWORD == RRF_RT_REG_DWORD | RRF_RT_REG_BINARY
nullptr,
reinterpret_cast<LPBYTE>(&allowGraphingCalculator),
&bufferSize)
== ERROR_SUCCESS)
{
_isGraphingModeEnabledCached = allowGraphingCalculator != 0;
}
else
{
_isGraphingModeEnabledCached = true;
}
return _isGraphingModeEnabledCached->Value; return _isGraphingModeEnabledCached->Value;
} }

1
src/CalcViewModel/pch.h
View File

@ -41,6 +41,7 @@
#include "winrt/Windows.System.UserProfile.h" #include "winrt/Windows.System.UserProfile.h"
#include "winrt/Windows.UI.Xaml.h" #include "winrt/Windows.UI.Xaml.h"
#include "winrt/Windows.Foundation.Metadata.h" #include "winrt/Windows.Foundation.Metadata.h"
#include "winrt/Windows.Management.Policies.h"
// The following namespaces exist as a convenience to resolve // The following namespaces exist as a convenience to resolve
// ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers