[Common] Move Elevated Apps Warning and Add Warning for AlwaysOnTop (#30607)

* [Common] - Elevated apps warning moved to common notifications - Warning added to AoT * [Common] Build fix. * [Common] Moved strings from common to AoT. * [Common] Show notification fix. * [Common] String name changed. * [Common] Remove blank space * [Common] Remove blank space * [Common] Remove blank space
2025-12-16 19:57:57 +01:00 · 2023-12-28 13:33:04 +03:00
parent 740299189a
commit cd57659ef6
16 changed files with 300 additions and 73 deletions
--- a/src/common/notifications/NotificationUtil.h
+++ b/src/common/notifications/NotificationUtil.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <common/notifications/notifications.h>
+#include <common/notifications/dont_show_again.h>
+#include <common/utils/resources.h>
+
+#include "Generated Files/resource.h"
+
+namespace notifications
+{
+    // Non-Localizable strings
+    namespace NonLocalizable
+    {
+        const wchar_t RunAsAdminInfoPage[] = L"https://aka.ms/powertoysDetectedElevatedHelp";
+        const wchar_t ToastNotificationButtonUrl[] = L"powertoys://cant_drag_elevated_disable/";
+    }
+
+    inline void WarnIfElevationIsRequired(std::wstring title, std::wstring message, std::wstring button1, std::wstring button2)
+    {
+        using namespace NonLocalizable;
+
+        static bool warning_shown = false;
+        if (!warning_shown && !is_toast_disabled(ElevatedDontShowAgainRegistryPath, ElevatedDisableIntervalInDays))
+        {
+            std::vector<action_t> actions = {
+                link_button{ button1, RunAsAdminInfoPage },
+                link_button{ button2, ToastNotificationButtonUrl }
+            };
+            show_toast_with_activations(message,
+                                        title,
+                                        {},
+                                        std::move(actions));
+            warning_shown = true;
+        }
+    }
+}
--- a/src/common/notifications/dont_show_again.h
+++ b/src/common/notifications/dont_show_again.h
@@ -4,8 +4,8 @@

 namespace notifications
 {
-    const inline wchar_t CantDragElevatedDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd})";
-    const inline int64_t CantDragElevatedDisableIntervalInDays = 30;
+    const inline wchar_t ElevatedDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd})";
+    const inline int64_t ElevatedDisableIntervalInDays = 30;

    const inline wchar_t PreviewModulesDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{7e29e2b2-b31c-4dcd-b7b0-79c078b02430})";
    const inline int64_t PreviewModulesDisableIntervalInDays = 30;
--- a/src/common/notifications/notifications.vcxproj
+++ b/src/common/notifications/notifications.vcxproj
@@ -27,6 +27,7 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="notifications.h" />
+    <ClInclude Include="NotificationUtil.h" />
    <ClInclude Include="dont_show_again.h" />
    <ClInclude Include="pch.h" />
  </ItemGroup>
--- a/src/common/utils/elevation.h
+++ b/src/common/utils/elevation.h
@@ -494,3 +494,30 @@ inline bool check_user_is_admin()
    freeMemory(pSID, pGroupInfo);
    return false;
 }
+
+inline bool IsProcessOfWindowElevated(HWND window)
+{
+    DWORD pid = 0;
+    GetWindowThreadProcessId(window, &pid);
+    if (!pid)
+    {
+        return false;
+    }
+
+    wil::unique_handle hProcess{ OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION,
+                                             FALSE,
+                                             pid) };
+
+    wil::unique_handle token;
+
+    if (OpenProcessToken(hProcess.get(), TOKEN_QUERY, &token))
+    {
+        TOKEN_ELEVATION elevation;
+        DWORD size;
+        if (GetTokenInformation(token.get(), TokenElevation, &elevation, sizeof(elevation), &size))
+        {
+            return elevation.TokenIsElevated != 0;
+        }
+    }
+    return false;
+}
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.base.rc
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.base.rc
@@ -0,0 +1,41 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../../common/version/version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "winres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+1 VERSIONINFO
+ FILEVERSION FILE_VERSION
+ PRODUCTVERSION PRODUCT_VERSION
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.cpp
@@ -8,6 +8,10 @@
 #include <common/utils/winapi_error.h>
 #include <common/utils/process_path.h>

+#include <common/utils/elevation.h>
+#include <common/notifications/NotificationUtil.h>
+#include <Generated Files/resource.h>
+
 #include <interop/shared_constants.h>

 #include <trace.h>
@@ -489,6 +493,10 @@ void AlwaysOnTop::HandleWinHookEvent(WinHookEvent* data) noexcept
    break;
    case EVENT_SYSTEM_FOREGROUND:
    {
+        if (!is_process_elevated() && IsProcessOfWindowElevated(data->hwnd))
+        {
+            notifications::WarnIfElevationIsRequired(GET_RESOURCE_STRING(IDS_ALWAYSONTOP), GET_RESOURCE_STRING(IDS_SYSTEM_FOREGROUND_ELEVATED), GET_RESOURCE_STRING(IDS_SYSTEM_FOREGROUND_ELEVATED_LEARN_MORE), GET_RESOURCE_STRING(IDS_SYSTEM_FOREGROUND_ELEVATED_DIALOG_DONT_SHOW_AGAIN));
+        }
        RefreshBorders();
    }
    break;
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
@@ -3,6 +3,9 @@
  <!-- Project configurations -->
  <!-- Props that should be disabled while building on CI server -->
  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h AlwaysOnTop.base.rc AlwaysOnTop.rc" />
+  </Target>
  <ItemDefinitionGroup Condition="'$(CIBuild)'!='true'">
    <ClCompile>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -141,9 +144,12 @@
  <ItemGroup>
    <ClInclude Include="AlwaysOnTop.h" />
    <ClInclude Include="FrameDrawer.h" />
+	<ClInclude Include="Generated Files/resource.h" />
    <ClInclude Include="ModuleConstants.h" />
+	<ClInclude Include="NotificationUtil.h" />
    <ClInclude Include="pch.h" />
    <ClInclude Include="resource.h" />
+	<None Include="resource.base.h" />
    <ClInclude Include="ScalingUtils.h" />
    <ClInclude Include="Settings.h" />
    <ClInclude Include="SettingsConstants.h" />
@@ -167,10 +173,17 @@
    </ProjectReference>
    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+	<ProjectReference Include="..\..\..\common\notifications\notifications.vcxproj">
+      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="AlwaysOnTop.rc" />
+    <ResourceCompile Include="Generated Files/AlwaysOnTop.rc" />
+    <None Include="AlwaysOnTop.base.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources.resx" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <Import Project="..\..\..\..\deps\spdlog.props" />
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj.filters
@@ -12,6 +12,9 @@
    <Filter Include="Resource Files">
      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+	<Filter Include="Generated Files">
+      <UniqueIdentifier>{A74B5AAC-E913-410D-8941-D73346CF47AE}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
@@ -49,8 +52,22 @@
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Generated Files/AlwaysOnTop.rc">
+      <Filter>Generated Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
+	<None Include="Resources.resx">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="resource.base.h">
+      <Filter>Header Files</Filter>
+    </None>
+    <None Include="AlwaysOnTop.base.rc">
+      <Filter>Resource Files</Filter>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h">
@@ -97,6 +114,9 @@
    </ClInclude>
    <ClInclude Include="ScalingUtils.h">
      <Filter>Header Files</Filter>
+    </ClInclude>
+	<ClInclude Include="Generated Files/resource.h">
+      <Filter>Generated Files</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
--- a/src/modules/alwaysontop/AlwaysOnTop/Resources.resx
+++ b/src/modules/alwaysontop/AlwaysOnTop/Resources.resx
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AlwaysOnTop" xml:space="preserve">
+    <value>AlwaysOnTop</value>
+    <comment>AlwaysOnTop is a product name, keep as is.</comment>
+  </data>
+  <data name="System_Foreground_Elevated" xml:space="preserve">
+    <value>We've detected an application running with administrator privileges. This will prevent certain interactions with these applications.</value>
+    <comment>administrator is context of user account.</comment>
+  </data>
+  <data name="System_Foreground_Elevated_Learn_More" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
+  <data name="System_Foreground_Elevated_Dialog_Dont_Show_Again" xml:space="preserve">
+    <value>Don't show again</value>
+  </data>
+</root>
--- a/src/modules/alwaysontop/AlwaysOnTop/resource.base.h
+++ b/src/modules/alwaysontop/AlwaysOnTop/resource.base.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by AlwaysOnTop.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys.AlwaysOnTop"
+#define INTERNAL_NAME "PowerToys.AlwaysOnTop"
+#define ORIGINAL_FILENAME "PowerToys.AlwaysOnTop.exe"
+
+// Non-localizable
+//////////////////////////////
--- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
@@ -61,7 +61,6 @@
    <ClInclude Include="ModuleConstants.h" />
    <ClInclude Include="MonitorUtils.h" />
    <ClInclude Include="WorkAreaConfiguration.h" />
-    <ClInclude Include="NotificationUtil.h" />
    <ClInclude Include="pch.h" />
    <ClInclude Include="Generated Files/resource.h" />
    <None Include="resource.base.h" />
--- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj.filters
@@ -153,9 +153,6 @@
    <ClInclude Include="HighlightedZones.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="NotificationUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="HighlightedZones.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/src/modules/fancyzones/FancyZonesLib/NotificationUtil.h
+++ b/src/modules/fancyzones/FancyZonesLib/NotificationUtil.h
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <common/notifications/notifications.h>
-#include <common/notifications/dont_show_again.h>
-#include <common/utils/resources.h>
-
-namespace FancyZonesNotifications
-{
-    // Non-Localizable strings
-    namespace NonLocalizable
-    {
-        const wchar_t FancyZonesRunAsAdminInfoPage[] = L"https://aka.ms/powertoysDetectedElevatedHelp";
-        const wchar_t ToastNotificationButtonUrl[] = L"powertoys://cant_drag_elevated_disable/";
-    }
-
-    inline void WarnIfElevationIsRequired()
-    {
-        using namespace notifications;
-        using namespace NonLocalizable;
-
-        static bool warning_shown = false;
-        if (!warning_shown && !is_toast_disabled(CantDragElevatedDontShowAgainRegistryPath, CantDragElevatedDisableIntervalInDays))
-        {
-            std::vector<action_t> actions = {
-                link_button{ GET_RESOURCE_STRING(IDS_CANT_DRAG_ELEVATED_LEARN_MORE), FancyZonesRunAsAdminInfoPage },
-                link_button{ GET_RESOURCE_STRING(IDS_CANT_DRAG_ELEVATED_DIALOG_DONT_SHOW_AGAIN), ToastNotificationButtonUrl }
-            };
-            show_toast_with_activations(GET_RESOURCE_STRING(IDS_CANT_DRAG_ELEVATED),
-                                        GET_RESOURCE_STRING(IDS_FANCYZONES),
-                                        {},
-                                        std::move(actions));
-            warning_shown = true;
-        }
-    }
-}
--- a/src/modules/fancyzones/FancyZonesLib/WindowMouseSnap.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WindowMouseSnap.cpp
@@ -4,7 +4,6 @@
 #include <FancyZonesLib/FancyZonesData/AppZoneHistory.h>
 #include <FancyZonesLib/FancyZonesWindowProcessing.h>
 #include <FancyZonesLib/FancyZonesWindowProperties.h>
-#include <FancyZonesLib/NotificationUtil.h>
 #include <FancyZonesLib/Settings.h>
 #include <FancyZonesLib/WindowUtils.h>
 #include <FancyZonesLib/WorkArea.h>
@@ -12,6 +11,7 @@
 #include <FancyZonesLib/trace.h>

 #include <common/utils/elevation.h>
+#include <common/notifications/NotificationUtil.h>

 WindowMouseSnap::WindowMouseSnap(HWND window, const std::unordered_map<HMONITOR, std::unique_ptr<WorkArea>>& activeWorkAreas) :
    m_window(window),
@@ -34,10 +34,10 @@ std::unique_ptr<WindowMouseSnap> WindowMouseSnap::Create(HWND window, const std:
        return nullptr;
    }

-    if (!is_process_elevated() && FancyZonesWindowUtils::IsProcessOfWindowElevated(window))
+    if (!is_process_elevated() && IsProcessOfWindowElevated(window))
    {
        // Notifies user if unable to drag elevated window
-        FancyZonesNotifications::WarnIfElevationIsRequired();
+        notifications::WarnIfElevationIsRequired(GET_RESOURCE_STRING(IDS_FANCYZONES), GET_RESOURCE_STRING(IDS_CANT_DRAG_ELEVATED), GET_RESOURCE_STRING(IDS_CANT_DRAG_ELEVATED_LEARN_MORE), GET_RESOURCE_STRING(IDS_CANT_DRAG_ELEVATED_DIALOG_DONT_SHOW_AGAIN));
        return nullptr;
    }

--- a/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp
@@ -158,33 +158,6 @@ bool FancyZonesWindowUtils::IsRoot(HWND window) noexcept
    return GetAncestor(window, GA_ROOT) == window;
 }

-bool FancyZonesWindowUtils::IsProcessOfWindowElevated(HWND window)
-{
-    DWORD pid = 0;
-    GetWindowThreadProcessId(window, &pid);
-    if (!pid)
-    {
-        return false;
-    }
-
-    wil::unique_handle hProcess{ OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION,
-                                             FALSE,
-                                             pid) };
-
-    wil::unique_handle token;
-
-    if (OpenProcessToken(hProcess.get(), TOKEN_QUERY, &token))
-    {
-        TOKEN_ELEVATION elevation;
-        DWORD size;
-        if (GetTokenInformation(token.get(), TokenElevation, &elevation, sizeof(elevation), &size))
-        {
-            return elevation.TokenIsElevated != 0;
-        }
-    }
-    return false;
-}
-
 bool FancyZonesWindowUtils::IsExcluded(HWND window)
 {
    std::wstring processPath = get_process_path_waiting_uwp(window);
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -274,7 +274,7 @@ toast_notification_handler_result toast_notification_handler(const std::wstring_

    if (param == cant_drag_elevated_disable)
    {
-        return notifications::disable_toast(notifications::CantDragElevatedDontShowAgainRegistryPath) ? toast_notification_handler_result::exit_success : toast_notification_handler_result::exit_error;
+        return notifications::disable_toast(notifications::ElevatedDontShowAgainRegistryPath) ? toast_notification_handler_result::exit_success : toast_notification_handler_result::exit_error;
    }
    else if (param.starts_with(update_now))
    {