Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove workarounds related to 0000 dekstop GUID. (#3931)

Browse Source
This commit is contained in:
vldmr11080
2020-06-02 12:06:36 +02:00
committed by GitHub
parent 0d59de5767
commit 1c7b07d614
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,10 +281,6 @@ namespace JSONHelpers
bool FancyZonesData::RemoveDevicesByVirtualDesktopId(const std::wstring& virtualDesktopId) bool FancyZonesData::RemoveDevicesByVirtualDesktopId(const std::wstring& virtualDesktopId)
{ {
std::scoped_lock lock{ dataLock }; std::scoped_lock lock{ dataLock };
if (virtualDesktopId == DEFAULT_GUID)
{
return false;
}
bool modified{ false }; bool modified{ false };
for (auto it = deviceInfoMap.begin(); it != deviceInfoMap.end();) for (auto it = deviceInfoMap.begin(); it != deviceInfoMap.end();)
{ {

5
src/modules/fancyzones/lib/VirtualDesktopUtils.cpp
View File

@@ -5,7 +5,6 @@
namespace VirtualDesktopUtils namespace VirtualDesktopUtils
{ {
const CLSID CLSID_ImmersiveShell = { 0xC2F03A33, 0x21F5, 0x47FA, 0xB4, 0xBB, 0x15, 0x63, 0x62, 0xA2, 0xF2, 0x39 }; const CLSID CLSID_ImmersiveShell = { 0xC2F03A33, 0x21F5, 0x47FA, 0xB4, 0xBB, 0x15, 0x63, 0x62, 0xA2, 0xF2, 0x39 };
const wchar_t GUID_EmptyGUID[] = L"{00000000-0000-0000-0000-000000000000}";
const wchar_t RegCurrentVirtualDesktop[] = L"CurrentVirtualDesktop"; const wchar_t RegCurrentVirtualDesktop[] = L"CurrentVirtualDesktop";
const wchar_t RegVirtualDesktopIds[] = L"VirtualDesktopIDs"; const wchar_t RegVirtualDesktopIds[] = L"VirtualDesktopIDs";
@@ -44,10 +43,6 @@ namespace VirtualDesktopUtils
// Format: <device-id>_<resolution>_<virtual-desktop-id> // Format: <device-id>_<resolution>_<virtual-desktop-id>
std::wstring uniqueId = zoneWindow->UniqueId(); std::wstring uniqueId = zoneWindow->UniqueId();
std::wstring virtualDesktopId = uniqueId.substr(uniqueId.rfind('_') + 1); std::wstring virtualDesktopId = uniqueId.substr(uniqueId.rfind('_') + 1);
if (virtualDesktopId == GUID_EmptyGUID)
{
return false;
}
return SUCCEEDED(CLSIDFromString(virtualDesktopId.c_str(), desktopId)); return SUCCEEDED(CLSIDFromString(virtualDesktopId.c_str(), desktopId));
} }