mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-08-30 05:57:42 +00:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Remove uneeded TmpMigrateAppliedZoneSets() (#1850)

Browse Source 
This was needed while we were migratin device-info so
active layout could be migrated as well. At some point
we dropped migration of device-info. Therefore, this has no
puprose anymore.
This commit is contained in:
stefansjfw 2020-04-08 15:43:19 +02:00 committed by GitHub
parent 91223a8431
commit 569c18c9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/modules/fancyzones/lib/JsonHelpers.cpp
View File

@ -604,9 +604,6 @@ namespace JSONHelpers
if (!std::filesystem::exists(jsonFilePath)) if (!std::filesystem::exists(jsonFilePath))
{ {
TmpMigrateAppliedZoneSetsFromRegistry();
// Custom zone sets have to be migrated after applied zone sets!
MigrateCustomZoneSetsFromRegistry(); MigrateCustomZoneSetsFromRegistry();
SaveFancyZonesData(); SaveFancyZonesData();
@ -639,56 +636,6 @@ namespace JSONHelpers
json::to_file(jsonFilePath, root); json::to_file(jsonFilePath, root);
} }
void FancyZonesData::TmpMigrateAppliedZoneSetsFromRegistry()
{
std::wregex ex(L"^[0-9]{3,4}_[0-9]{3,4}$");
std::scoped_lock lock{ dataLock };
wchar_t key[256];
StringCchPrintf(key, ARRAYSIZE(key), L"%s", RegistryHelpers::REG_SETTINGS);
HKEY hkey;
if (RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_ALL_ACCESS, &hkey) == ERROR_SUCCESS)
{
wchar_t resolutionKey[256]{};
DWORD resolutionKeyLength = ARRAYSIZE(resolutionKey);
DWORD i = 0;
while (RegEnumKeyW(hkey, i++, resolutionKey, resolutionKeyLength) == ERROR_SUCCESS)
{
std::wstring resolution{ resolutionKey };
wchar_t appliedZoneSetskey[256];
StringCchPrintf(appliedZoneSetskey, ARRAYSIZE(appliedZoneSetskey), L"%s\\%s", RegistryHelpers::REG_SETTINGS, resolutionKey);
HKEY appliedZoneSetsHkey;
if (std::regex_match(resolution, ex) && RegOpenKeyExW(HKEY_CURRENT_USER, appliedZoneSetskey, 0, KEY_ALL_ACCESS, &appliedZoneSetsHkey) == ERROR_SUCCESS)
{
ZoneSetPersistedDataOLD data;
DWORD dataSize = sizeof(data);
wchar_t value[256]{};
DWORD valueLength = ARRAYSIZE(value);
DWORD i = 0;
while (RegEnumValueW(appliedZoneSetsHkey, i++, value, &valueLength, nullptr, nullptr, reinterpret_cast<BYTE*>(&data), &dataSize) == ERROR_SUCCESS)
{
ZoneSetData appliedZoneSetData;
appliedZoneSetData.type = TypeFromLayoutId(data.LayoutId);
if (appliedZoneSetData.type != ZoneSetLayoutType::Custom)
{
appliedZoneSetData.uuid = std::wstring{ value };
}
else
{
// uuid is changed later to actual uuid when migrating custom zone sets
appliedZoneSetData.uuid = std::to_wstring(data.LayoutId);
}
appliedZoneSetsMap[value] = appliedZoneSetData;
dataSize = sizeof(data);
valueLength = ARRAYSIZE(value);
}
}
resolutionKeyLength = ARRAYSIZE(resolutionKey);
}
}
}
void FancyZonesData::MigrateCustomZoneSetsFromRegistry() void FancyZonesData::MigrateCustomZoneSetsFromRegistry()
{ {
std::scoped_lock lock{ dataLock }; std::scoped_lock lock{ dataLock };
@ -709,29 +656,19 @@ namespace JSONHelpers
zoneSetData.type = static_cast<CustomLayoutType>(data[2]); zoneSetData.type = static_cast<CustomLayoutType>(data[2]);
// int version = data[0] * 256 + data[1]; - Not used anymore // int version = data[0] * 256 + data[1]; - Not used anymore
std::wstring uuid = std::to_wstring(data[3] * 256 + data[4]); GUID guid;
auto it = std::find_if(appliedZoneSetsMap.cbegin(), appliedZoneSetsMap.cend(), [&uuid](std::pair<std::wstring, ZoneSetData> zoneSetMap) { auto result = CoCreateGuid(&guid);
return zoneSetMap.second.uuid.compare(uuid) == 0; if (result != S_OK)
}); {
continue;
}
wil::unique_cotaskmem_string guidString;
if (!SUCCEEDED_LOG(StringFromCLSID(guid, &guidString)))
{
continue;
}
if (it != appliedZoneSetsMap.cend()) std::wstring uuid = guidString.get();
{
uuid = it->first;
}
else
{
GUID guid;
auto result = CoCreateGuid(&guid);
if (result != S_OK)
{
return;
}
wil::unique_cotaskmem_string guidString;
if (SUCCEEDED_LOG(StringFromCLSID(guid, &guidString)))
{
uuid = guidString.get();
}
}
switch (zoneSetData.type) switch (zoneSetData.type)
{ {

3
src/modules/fancyzones/lib/JsonHelpers.h
View File

@ -207,7 +207,6 @@ namespace JSONHelpers
#if defined(UNIT_TESTS) #if defined(UNIT_TESTS)
inline void clear_data() inline void clear_data()
{ {
appliedZoneSetsMap.clear();
appZoneHistoryMap.clear(); appZoneHistoryMap.clear();
deviceInfoMap.clear(); deviceInfoMap.clear();
customZoneSetsMap.clear(); customZoneSetsMap.clear();
@ -254,10 +253,8 @@ namespace JSONHelpers
void SaveFancyZonesData() const; void SaveFancyZonesData() const;
private: private:
void TmpMigrateAppliedZoneSetsFromRegistry();
void MigrateCustomZoneSetsFromRegistry(); void MigrateCustomZoneSetsFromRegistry();
std::unordered_map<std::wstring, ZoneSetData> appliedZoneSetsMap{};
std::unordered_map<std::wstring, AppZoneHistoryData> appZoneHistoryMap{}; std::unordered_map<std::wstring, AppZoneHistoryData> appZoneHistoryMap{};
std::unordered_map<std::wstring, DeviceInfoData> deviceInfoMap{}; std::unordered_map<std::wstring, DeviceInfoData> deviceInfoMap{};
std::unordered_map<std::wstring, CustomZoneSetData> customZoneSetsMap{}; std::unordered_map<std::wstring, CustomZoneSetData> customZoneSetsMap{};