public/gpui
1
0
Fork 0
mirror of https://github.com/august-alt/gpui.git synced 2025-03-14 12:58:39 +03:00
Code Issues Projects Releases Wiki Activity

fix: add optional behaviour to valuePrefix of PolicyListElement

Browse Source
This commit is contained in:
Корней Гедерт 2024-10-03 14:13:04 +04:00
parent 05e9d713c1
commit 81c574d7c8
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/administrative_templates/admx/policylistelement.h
View File

@ -23,6 +23,7 @@
#include "policyelement.h"
#include <optional>
#include <string>
namespace model
@ -38,7 +39,7 @@ public:
/*!
* \brief A prefix for value.
*/
std::string valuePrefix{};
std::optional<std::string> valuePrefix{};
/*!
* \brief additive If this option is specified true, existing subkeys are not deleted,

41
src/plugins/administrative_templates/ui/presentationbuilder.cpp
View File

@ -107,19 +107,19 @@ QHBoxLayout *createCaptions()
return horizontalLayout;
}
QMap<std::string, QString> loadListFromRegistry(AbstractRegistrySource &source, const std::string &key, const std::string &prefix)
QMap<std::string, QString> loadListFromRegistry(AbstractRegistrySource &source, const std::string &key, const std::optional<std::string> &prefix)
{
QMap<std::string, QString> items;
std::vector<std::string> valueNames = source.getNonSpecialValueNames(key);
if(!prefix.empty())
if (prefix && !prefix->empty())
{
// remove all valueNames(from return result), that doesn't have `prefix` prefix
valueNames.erase(std::remove_if(valueNames.begin(), valueNames.end(),
[&prefix](const std::string& str)
{
return !(str.length() > prefix.length() &&
strncmp(str.c_str(), prefix.c_str(), prefix.length()));
return !(str.length() > prefix->length() &&
strncmp(str.c_str(), prefix->c_str(), prefix->length()));
}), valueNames.end());
}
@ -130,10 +130,12 @@ QMap<std::string, QString> loadListFromRegistry(AbstractRegistrySource &source,
return items;
}
void cleanUpListInRegistry(AbstractRegistrySource &source, const std::string &key, const std::string &prefix = "")
void cleanUpListInRegistry(AbstractRegistrySource &source, const std::string &key, const std::optional<std::string> &prefix)
{
// small optimization
if (prefix.empty())
// 1 case: clear all valueNames in key.
// 2 case: any valueName by key has an empty prefix.
if (!prefix || prefix->empty())
{
source.clearKey(key);
}
@ -143,19 +145,19 @@ void cleanUpListInRegistry(AbstractRegistrySource &source, const std::string &ke
// TODO: make case-insensitive.
// clean-up all values that contain `prefix` prefix (case-sensitive)
for (auto &value : valueNames) {
if (value.size() > prefix.size() &&
strncmp(value.c_str(), prefix.c_str(), prefix.size()) == 0)
if (value.size() > prefix->size() &&
strncmp(value.c_str(), prefix->c_str(), prefix->size()) == 0)
{
source.clearValue(key, value);
}
}
}
void writeListIntoRegistry(AbstractRegistrySource &source, QMap<std::string, QString> valueList, const std::string &key, bool explicitValue, bool expandable, std::string &prefix)
void writeListIntoRegistry(AbstractRegistrySource &source, QMap<std::string, QString> valueList, const std::string &key, bool explicitValue, bool expandable, const std::optional<std::string> &prefix)
{
// https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2008-r2-and-2008/cc731025(v=ws.10)
// explicitValue cannot be used with the valuePrefix attribute.
if (explicitValue && !prefix.empty())
if (prefix && explicitValue)
{
qWarning() << "Presentation builder::save: attempt to use explicitValue with the valuePrefix attribute";
}
@ -164,7 +166,7 @@ void writeListIntoRegistry(AbstractRegistrySource &source, QMap<std::string, QSt
{
return;
}
// https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2008-r2-and-2008/cc770327(v=ws.10)
// true represents expandable string type (REG_EXPAND_SZ) and false represents string type (REG_SZ)
auto type = expandable ? REG_EXPAND_SZ : REG_SZ;
@ -186,11 +188,22 @@ void writeListIntoRegistry(AbstractRegistrySource &source, QMap<std::string, QSt
source.setValue(key, "**delvals.", REG_SZ, " ");
size_t index = 1;
if (prefix)
{
for (auto begin = valueList.begin(), end = valueList.end(); begin != end; ++begin, ++index)
{
// https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2008-r2-and-2008/cc772195(v=ws.10)
// valuePrefix represents the text string to be prepended to the incremented integer for registry subkey creation.
source.setValue(key, *prefix + std::to_string(index), type, begin.value());
}
return;
}
for (auto begin = valueList.begin(), end = valueList.end(); begin != end; ++begin, ++index)
{
// https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2008-r2-and-2008/cc772195(v=ws.10)
// valuePrefix represents the text string to be prepended to the incremented integer for registry subkey creation.
source.setValue(key, prefix + std::to_string(index), type, begin.value());
source.setValue(key, begin.value().toStdString(), type, begin.value());
}
}
@ -511,7 +524,7 @@ public:
qWarning() << "List element: " << listElement->id.c_str() << "\n"
<< "key: " << listElement->key.c_str() << "\n"
<< "valueName: " << listElement->valueName.c_str() << "\n"
<< "valuePrefix: " << listElement->valuePrefix.c_str() << "\n"
<< "valuePrefix: " << (listElement->valuePrefix ? listElement->valuePrefix->c_str() : "(null)") << "\n"
<< "additive: " << listElement->additive << "\n"
<< "expandable: " << listElement->expandable << "\n"
<< "explicitValue" << listElement->explicitValue << "\n";
@ -534,7 +547,7 @@ public:
// https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2008-r2-and-2008/cc731025(v=ws.10)
// explicitValue cannot be used with the valuePrefix attribute.
if (listElement->valuePrefix.size() > 0 && listElement->explicitValue)
if (listElement->valuePrefix && listElement->explicitValue)
{
qWarning() << "Unable to get valid policy listElement (explicitValue cannot be used with the valuePrefix attribute).";
return;